projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
More useful/hinting error messages in git-checkout
[git.git]
/
gitMergeCommon.py
2006-02-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
2006-02-02
Fredrik Kuivinen
merge-recursive: Speed up commit graph construction
blob
|
commitdiff
2005-12-07
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-11-29
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-11-28
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-11-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-11-22
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-11-20
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-11-19
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-11-12
Junio C Hamano
GIT 0.99.9h
v0.99.9h
v1.0rc1
blob
|
commitdiff
|
diff to current
2005-11-12
Fredrik Kuivinen
merge-recursive: Add copyright notice
blob
|
commitdiff
|
diff to current
2005-11-07
Junio C Hamano
GIT 0.99.9e
v0.99.9e
blob
|
commitdiff
|
diff to current
2005-10-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-10-03
Peter Anvin
Merge with master.kernel.org:/pub/scm/git/git.git
blob
|
commitdiff
|
diff to current
2005-10-03
Junio C Hamano
Merge branch 'fixes'
blob
|
commitdiff
|
diff to current
2005-10-03
Fredrik Kuivinen
[PATCH] Enable and fix support for base less merges.
blob
|
commitdiff
|
diff to current
2005-09-27
Junio C Hamano
Merge http://www.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
diff to current
2005-09-20
Junio C Hamano
Ship our own copy of subprocess.py
blob
|
commitdiff
|
diff to current
2005-09-14
Junio C Hamano
Merge branch 'master' of .
blob
|
commitdiff
|
diff to current
2005-09-13
Fredrik Kuivinen
[PATCH] Use the 'die' function where it is appropriate.
blob
|
commitdiff
|
diff to current
2005-09-13
Junio C Hamano
Merge branch 'master' of .
blob
|
commitdiff
|
diff to current
2005-09-12
Fredrik Kuivinen
[PATCH] Make the ProgramError class printable.
blob
|
commitdiff
|
diff to current
2005-09-12
Fredrik Kuivinen
[PATCH] Introduce a 'die' function.
blob
|
commitdiff
|
diff to current
2005-09-11
Junio C Hamano
Add a new merge strategy by Fredrik Kuivinen.
blob
|
commitdiff
|
diff to current