projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Fix object re-hashing
[git] / git-merge.sh
2006-02-12  Junio C HamanoOnly call git-rerere if $GIT_DIR/rr-cache exists. blob | commitdiff | raw
2006-02-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2006-02-07  Junio C Hamanogit-rerere: reuse recorded resolve. blob | commitdiff | raw | diff to current
2006-02-04  Junio C HamanoMerge branches 'jc/sha1', 'jc/diff' and 'jc/ws' blob | commitdiff | raw | diff to current
2006-02-04  Junio C Hamanogit-merge: Properly quote $merge_msg variable. blob | commitdiff | raw | diff to current
2006-01-30  Junio C HamanoMerge fixes up to GIT 1.1.6 blob | commitdiff | raw | diff to current
2006-01-28  Junio C Hamanomerge: seed the commit message with list of conflicted... blob | commitdiff | raw | diff to current
2005-12-26  Junio C HamanoMerge branch 'jc/checkout' blob | commitdiff | raw | diff to current
2005-12-24  Junio C HamanoMerge fixes up to GIT 1.0.4 blob | commitdiff | raw | diff to current
2005-12-24  Junio C HamanoGIT 1.0.4 v1.0.4 blob | commitdiff | raw | diff to current
2005-12-23  Junio C Hamanomerge --no-commit: tweak message blob | commitdiff | raw | diff to current
2005-12-15  Junio C HamanoGIT 0.99.9n aka 1.0rc6 v0.99.9n v1.0rc6 blob | commitdiff | raw | diff to current
2005-12-14  Junio C HamanoMerge branch 'hold/am' blob | commitdiff | raw | diff to current
2005-12-14  Junio C HamanoMerge branch 'fk/usage' blob | commitdiff | raw | diff to current
2005-12-14  freku045@student... Trivial usage string clean-up blob | commitdiff | raw | diff to current
2005-12-14  Junio C Hamano[PATCH] allow merging any committish blob | commitdiff | raw | diff to current
2005-12-07  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-12-04  Junio C HamanoGIT 0.99.9l aka 1.0rc4 v0.99.9l v1.0rc4 blob | commitdiff | raw | diff to current
2005-12-03  Fredrik Kuivinengit-merge: Exit with code 2 if no strategy was able... blob | commitdiff | raw | diff to current
2005-11-29  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-28  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-26  Junio C HamanoGIT 0.99.9k v0.99.9k blob | commitdiff | raw | diff to current
2005-11-25  Junio C Hamanogit-sh-setup: die if outside git repository. blob | commitdiff | raw | diff to current
2005-11-24  Junio C Hamanogit-merge: make recursive the default strategy blob | commitdiff | raw | diff to current
2005-11-22  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-20  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-19  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-11-10  Junio C HamanoGIT 0.99.9g v0.99.9g blob | commitdiff | raw | diff to current
2005-11-10  Junio C HamanoUse 'merge-base --all' where applicable. blob | commitdiff | raw | diff to current
2005-11-07  Junio C HamanoGIT 0.99.9e v0.99.9e blob | commitdiff | raw | diff to current
2005-11-03  Junio C HamanoGIT 0.99.9c v0.99.9c blob | commitdiff | raw | diff to current
2005-11-03  Junio C HamanoAdd 'ours' merge strategy. blob | commitdiff | raw | diff to current
2005-11-03  Junio C HamanoAdd --no-commit to git-merge/git-pull. blob | commitdiff | raw | diff to current
2005-10-31  Junio C HamanoGIT 0.99.9a v0.99.9a blob | commitdiff | raw | diff to current
2005-10-28  Chris ShoemakerDocumentation changes to recursive option for git-diff... blob | commitdiff | raw | diff to current
2005-10-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-10-23  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-22  Junio C HamanoAllow git-merge not to commit. blob | commitdiff | raw | diff to current
2005-10-03  Peter AnvinMerge with master.kernel.org:/pub/scm/git/git.git blob | commitdiff | raw | diff to current
2005-10-03  Junio C HamanoMerge branch 'fixes' blob | commitdiff | raw | diff to current
2005-10-03  Peter AnvinMerge 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 HamanoHandle really trivial case inside git-merge. blob | commitdiff | raw | diff to current
2005-09-29  Peter AnvinMerge ... www.kernel.org/pub/scm/git/git.git blob | commitdiff | raw | diff to current
2005-09-28  Junio C HamanoUse git-update-ref in scripts. blob | commitdiff | raw | diff to current
2005-09-28  Junio C HamanoFastpath the normal case by not checking that index... blob | commitdiff | raw | diff to current
2005-09-27  H. Peter AnvinMerge ... git+ssh://kernel.org/pub/scm/git/git.git blob | commitdiff | raw | diff to current
2005-09-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | raw | diff to current
2005-09-27  Junio C HamanoGive default merge message after failed automerge. blob | commitdiff | raw | diff to current
2005-09-27  Junio C HamanoFix 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 HamanoMerge 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 HamanoFix off-by-one error in git-merge blob | commitdiff | raw | diff to current
2005-09-11  Junio C HamanoAdd a new merge strategy by Fredrik Kuivinen. blob | commitdiff | raw | diff to current
2005-09-11  Junio C HamanoUse Daniel's read-tree in the merge strategy 'resolve'. blob | commitdiff | raw | diff to current
2005-09-11  Junio C HamanoMulti-backend merge driver. blob | commitdiff | raw | diff to current
Unnamed repository; edit this file 'description' to name the repository.