tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
ls-files: --others should not say unmerged paths are unknown.
[git.git]
/
git-merge.sh
2005-11-03
Junio C Hamano
Add 'ours' merge strategy.
blob
|
commitdiff
|
raw
2005-11-03
Junio C Hamano
Add --no-commit to git-merge/git-pull.
blob
|
commitdiff
|
raw
|
diff to current
2005-10-28
Chris Shoemaker
Documentation changes to recursive option for git-diff...
blob
|
commitdiff
|
raw
|
diff to current
2005-10-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-10-23
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-22
Junio C Hamano
Allow git-merge not to commit.
blob
|
commitdiff
|
raw
|
diff to current
2005-10-03
Peter Anvin
Merge with master.kernel.org:/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2005-10-03
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
raw
|
diff to current
2005-10-03
Peter Anvin
Merge with master.kernel.org:/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2005-10-03
Fredrik Kuivinen
[PATCH] Enable and fix support for base less merges.
blob
|
commitdiff
|
raw
|
diff to current
2005-10-02
Junio C Hamano
Handle really trivial case inside git-merge.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-29
Peter Anvin
Merge ... www.kernel.org/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2005-09-28
Junio C Hamano
Use git-update-ref in scripts.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-28
Junio C Hamano
Fastpath the normal case by not checking that index...
blob
|
commitdiff
|
raw
|
diff to current
2005-09-27
H. Peter Anvin
Merge ... git+ssh://kernel.org/pub/scm/git/git.git
blob
|
commitdiff
|
raw
|
diff to current
2005-09-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2005-09-27
Junio C Hamano
Give default merge message after failed automerge.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-27
Junio C Hamano
Fix overzealous cleanliness check in git-merge
blob
|
commitdiff
|
raw
|
diff to current
2005-09-25
Fredrik Kuivinen
[PATCH] More descriptive messages for conflict cases...
blob
|
commitdiff
|
raw
|
diff to current
2005-09-14
Junio C Hamano
Merge branch 'master' of .
blob
|
commitdiff
|
raw
|
diff to current
2005-09-13
Fredrik Kuivinen
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-13
Junio C Hamano
Fix off-by-one error in git-merge
blob
|
commitdiff
|
raw
|
diff to current
2005-09-11
Junio C Hamano
Add a new merge strategy by Fredrik Kuivinen.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-11
Junio C Hamano
Use Daniel's read-tree in the merge strategy 'resolve'.
blob
|
commitdiff
|
raw
|
diff to current
2005-09-11
Junio C Hamano
Multi-backend merge driver.
blob
|
commitdiff
|
raw
|
diff to current
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
