Commits · v1.0rc3 · CSG / git-rfc3161 · GitLab

Snippets Groups Projects

Nov 10, 2005
- Use 'merge-base --all' where applicable. · 13956670
  Junio C Hamano authored Nov 10, 2005
  13956670
Nov 03, 2005
- Add 'ours' merge strategy. · 64da9e60
  Junio C Hamano authored Nov 2, 2005
  64da9e60
- Add --no-commit to git-merge/git-pull. · 123ee3ca
  Junio C Hamano authored Nov 2, 2005
  123ee3ca
Oct 28, 2005
- Documentation changes to recursive option for git-diff-tree · 50b8e355
  Chris Shoemaker authored Oct 28, 2005
  50b8e355
Oct 22, 2005
- Allow git-merge not to commit. · 4f692b19
  Junio C Hamano authored Oct 22, 2005
  4f692b19
Oct 03, 2005
- [PATCH] Enable and fix support for base less merges. · 88f8f0a5
  Fredrik Kuivinen authored Oct 3, 2005
  88f8f0a5
Oct 02, 2005
- Handle really trivial case inside git-merge. · f9d72413
  Junio C Hamano authored Oct 2, 2005
  f9d72413
Sep 28, 2005
- Use git-update-ref in scripts. · bf7960eb
  Junio C Hamano authored Sep 28, 2005
  bf7960eb
- Fastpath the normal case by not checking that index matches HEAD. · 60fa0560
  Junio C Hamano authored Sep 28, 2005
  60fa0560
Sep 27, 2005
- Give default merge message after failed automerge. · deca7e8c
  Junio C Hamano authored Sep 25, 2005
  deca7e8c
- Fix overzealous cleanliness check in git-merge · a9358240
  Junio C Hamano authored Sep 23, 2005
  a9358240
Sep 25, 2005
- [PATCH] More descriptive messages for conflict cases in merges · 8cc01e50
  Fredrik Kuivinen authored Sep 25, 2005
  8cc01e50
Sep 13, 2005
- [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. · e4cf17ce
  Fredrik Kuivinen authored Sep 13, 2005
  e4cf17ce
- Fix off-by-one error in git-merge · f88ed172
  Junio C Hamano authored Sep 13, 2005
  f88ed172
Sep 11, 2005
- Add a new merge strategy by Fredrik Kuivinen. · 720d150c
  Junio C Hamano authored Sep 11, 2005
  720d150c
- Use Daniel's read-tree in the merge strategy 'resolve'. · 2276aa6c
  Junio C Hamano authored Sep 11, 2005
  2276aa6c
- Multi-backend merge driver. · 91063bbc
  Junio C Hamano authored Sep 8, 2005
  91063bbc