projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Teach update-ref about a symbolic ref stored in a textfile.
[git]
/
git-merge.sh
2005-09-28
Junio C Hamano
Use git-update-ref in scripts.
blob
|
commitdiff
|
raw
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
projects / git / history
Junio C Hamano
H. Peter Anvin
Fredrik Kuivinen