GIT 1.2.3

1. d64e6b0 Keep Porcelainish from failing by broken ident after making changes. by Junio C Hamano · 20 years ago
2. 1536dd9c6 Only call git-rerere if $GIT_DIR/rr-cache exists. by Junio C Hamano · 20 years ago
3. 8389b52 git-rerere: reuse recorded resolve. by Junio C Hamano · 20 years ago
4. c0c74a8 git-merge: Properly quote $merge_msg variable. by Junio C Hamano · 20 years ago
5. 6b94f1e merge: seed the commit message with list of conflicted files. by Junio C Hamano · 20 years ago
6. 695bf72 merge --no-commit: tweak message by Junio C Hamano · 20 years ago
7. 806f36d Trivial usage string clean-up by freku045@student.liu.se · 20 years ago
8. 9954f5b [PATCH] allow merging any committish by Junio C Hamano · 20 years ago
9. 4275df5 git-merge: Exit with code 2 if no strategy was able to handle the merge. by Fredrik Kuivinen · 20 years ago
10. ae2b0f1 git-sh-setup: die if outside git repository. by Junio C Hamano · 20 years ago
11. fbf8ac2 git-merge: make recursive the default strategy by Junio C Hamano · 20 years ago
12. 1395667 Use 'merge-base --all' where applicable. by Junio C Hamano · 20 years ago
13. 64da9e6 Add 'ours' merge strategy. by Junio C Hamano · 20 years ago
14. 123ee3c Add --no-commit to git-merge/git-pull. by Junio C Hamano · 20 years ago
15. 50b8e35 Documentation changes to recursive option for git-diff-tree by Chris Shoemaker · 20 years ago
16. 4f692b1 Allow git-merge not to commit. by Junio C Hamano · 20 years ago
17. 88f8f0a [PATCH] Enable and fix support for base less merges. by Fredrik Kuivinen · 20 years ago
18. f9d7241 Handle really trivial case inside git-merge. by Junio C Hamano · 20 years ago
19. bf7960e Use git-update-ref in scripts. by Junio C Hamano · 20 years ago
20. 60fa056 Fastpath the normal case by not checking that index matches HEAD. by Junio C Hamano · 20 years ago
21. deca7e8 Give default merge message after failed automerge. by Junio C Hamano · 20 years ago
22. a935824 Fix overzealous cleanliness check in git-merge by Junio C Hamano · 20 years ago
23. 8cc01e5 [PATCH] More descriptive messages for conflict cases in merges by Fredrik Kuivinen · 20 years ago
24. e4cf17c [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. by Fredrik Kuivinen · 20 years ago
25. f88ed17 Fix off-by-one error in git-merge by Junio C Hamano · 20 years ago
26. 720d150 Add a new merge strategy by Fredrik Kuivinen. by Junio C Hamano · 20 years ago
27. 2276aa6 Use Daniel's read-tree in the merge strategy 'resolve'. by Junio C Hamano · 20 years ago
28. 91063bb Multi-backend merge driver. by Junio C Hamano · 20 years ago