Andrew's git / gitweb.git / history
?
Merge branch 'jc/maint-combine-diff-pre-context' into maint
[gitweb.git] / Documentation / technical / trivial-merge.txt
2005-11-07 GIT 0.99.9e v0.99.9e blob | diff | raw
2005-10-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2005-09-27 Merge http://www.kernel.org/pub/scm/gitk/gitk blob | diff | raw
2005-09-25 Merge branch 'fixes' blob | diff | raw
2005-09-25 [PATCH] Finish documenting trivial merge rules blob | diff | raw
2005-09-11 [PATCH] Document the trivial merge rules for 3(+more... blob | diff | raw | diff to current