Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
diff: --full-index
[gitweb.git]
/
git-merge.sh
2005-11-10
Use 'merge-base --all' where applicable.
blob
|
diff
|
raw
2005-11-03
Add 'ours' merge strategy.
blob
|
diff
|
raw
|
diff to current
2005-11-03
Add --no-commit to git-merge/git-pull.
blob
|
diff
|
raw
|
diff to current
2005-10-28
Documentation changes to recursive option for git-diff...
blob
|
diff
|
raw
|
diff to current
2005-10-27
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-10-23
Merge branch 'fixes'
blob
|
diff
|
raw
|
diff to current
2005-10-22
Allow git-merge not to commit.
blob
|
diff
|
raw
|
diff to current
2005-10-03
Merge with master.kernel.org:/pub/scm/git/git.git
blob
|
diff
|
raw
|
diff to current
2005-10-03
Merge branch 'fixes'
blob
|
diff
|
raw
|
diff to current
2005-10-03
Merge with master.kernel.org:/pub/scm/git/git.git
blob
|
diff
|
raw
|
diff to current
2005-10-03
[PATCH] Enable and fix support for base less merges.
blob
|
diff
|
raw
|
diff to current
2005-10-02
Handle really trivial case inside git-merge.
blob
|
diff
|
raw
|
diff to current
2005-09-29
Merge ... www.kernel.org/pub/scm/git/git.git
blob
|
diff
|
raw
|
diff to current
2005-09-28
Use git-update-ref in scripts.
blob
|
diff
|
raw
|
diff to current
2005-09-28
Fastpath the normal case by not checking that index...
blob
|
diff
|
raw
|
diff to current
2005-09-27
Merge ... git+ssh://kernel.org/pub/scm/git/git.git
blob
|
diff
|
raw
|
diff to current
2005-09-27
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2005-09-27
Give default merge message after failed automerge.
blob
|
diff
|
raw
|
diff to current
2005-09-27
Fix overzealous cleanliness check in git-merge
blob
|
diff
|
raw
|
diff to current
2005-09-25
[PATCH] More descriptive messages for conflict cases...
blob
|
diff
|
raw
|
diff to current
2005-09-14
Merge branch 'master' of .
blob
|
diff
|
raw
|
diff to current
2005-09-13
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
blob
|
diff
|
raw
|
diff to current
2005-09-13
Fix off-by-one error in git-merge
blob
|
diff
|
raw
|
diff to current
2005-09-11
Add a new merge strategy by Fredrik Kuivinen.
blob
|
diff
|
raw
|
diff to current
2005-09-11
Use Daniel's read-tree in the merge strategy 'resolve'.
blob
|
diff
|
raw
|
diff to current
2005-09-11
Multi-backend merge driver.
blob
|
diff
|
raw
|
diff to current