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

Snippets Groups Projects

Nov 12, 2005
- merge-one-file: use empty- or common-base condintionally in two-stage merge. · fd66dbf5
  Junio C Hamano authored Nov 11, 2005
  fd66dbf5
- merge-one-file: use common as base, instead of emptiness. · cb93c193
  Junio C Hamano authored Nov 10, 2005
  cb93c193
- merge with /dev/null as base, instead of punting O==empty case · f7d24bbe
  Junio C Hamano authored Nov 8, 2005
  f7d24bbe
Sep 08, 2005
- Big tool rename. · 215a7ad1
  Junio C Hamano authored Sep 8, 2005
  215a7ad1
Aug 30, 2005
- [PATCH] Make "git resolve" less scary · cdcb0ed4
  Linus Torvalds authored Aug 30, 2005
  cdcb0ed4
Jul 30, 2005
- [PATCH] Trivial tidyups · 0b124bb4
  Petr Baudis authored Jul 29, 2005
  0b124bb4
Jun 25, 2005
- [PATCH] git-merge-one-file-script: do not misinterpret rm failure. · aacc15ec
  Junio C Hamano authored Jun 25, 2005
  aacc15ec
Jun 09, 2005
- One more time.. Clean up git-merge-one-file-script · 98a96b00
  Linus Torvalds authored Jun 9, 2005
  98a96b00
- Fix up git-merge-one-file-script · e0226add
  Linus Torvalds authored Jun 9, 2005
  e0226add
Jun 08, 2005
- [PATCH] git-merge-one-file-script cleanups from Cogito · ec73962d
  Petr Baudis authored Jun 8, 2005
  ec73962d
- Make sure we error out if we can't remove a file on automatic merges. · ae3858e7
  Linus Torvalds authored Jun 8, 2005
  ae3858e7
- [PATCH] Fix git-merge-one-file permissions auto-merging · 8544a6f1
  Petr Baudis authored Jun 8, 2005
  8544a6f1
- Leave merge failures in the filesystem · 2a68a865
  Linus Torvalds authored Jun 8, 2005
  2a68a865
May 07, 2005
- Use backticks in git-merge-one-file-script instead of $(command). · c7d1d4e1
  Junio C Hamano authored May 7, 2005
  c7d1d4e1
May 02, 2005
- Update git-merge-one-file-script. · ee28152d
  Junio C Hamano authored May 2, 2005
  ee28152d
May 01, 2005
- [PATCH] Really fix git-merge-one-file-script this time. · 21a08dcb
  Junio C Hamano authored May 1, 2005
  21a08dcb
Apr 29, 2005
- [PATCH] leftover bits for git rename · 0fc65a45
  Junio C Hamano authored Apr 29, 2005
  0fc65a45
- Update the merge scripts for the big git rename. · 2d280e1c
  Linus Torvalds authored Apr 29, 2005
  2d280e1c
Apr 24, 2005
- [PATCH] make file merging respect permissions · e2b6a9d0
  James Bottomley authored Apr 24, 2005
  e2b6a9d0
Apr 19, 2005
- [PATCH] SCSI trees, merges and git status · 0a9ea850
  James Bottomley authored Apr 19, 2005
  0a9ea850
Apr 18, 2005
- Change merge-cache and git-merge-one-file to use the SHA1 of the file · e3b4be7f
  Linus Torvalds authored Apr 18, 2005
  e3b4be7f
- Add the simple scripts I used to do a merge with content conflicts. · 839a7a06
  Linus Torvalds authored Apr 18, 2005
  839a7a06