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

Snippets Groups Projects

Nov 17, 2005
- GIT 0.99.9j aka 1.0rc3 · 27dedf0c
  Junio C Hamano authored Nov 17, 2005
  View commit 27dedf0c 2 tags
  
  27dedf0c
Nov 12, 2005
- merge-recursive: Use '~' instead of '_' to separate file names from branch names · e9af60c8
  Fredrik Kuivinen authored Nov 11, 2005
  e9af60c8
- merge-recursive: Add copyright notice · 857f26d2
  Fredrik Kuivinen authored Nov 11, 2005
  857f26d2
- merge-recursive: Indent the output properly · 46e65174
  Fredrik Kuivinen authored Nov 11, 2005
  46e65174
Nov 09, 2005
- merge-recursive: Fix support for branch names containing slashes · 186f855f
  Fredrik Kuivinen authored Nov 9, 2005
  186f855f
- merge-recursive: Fix limited output of rename messages · c8a4f5e5
  Fredrik Kuivinen authored Nov 9, 2005
  c8a4f5e5
Nov 08, 2005
- merge-recursive: Only print relevant rename messages · d1745afa
  Fredrik Kuivinen authored Nov 7, 2005
  d1745afa
Oct 10, 2005
- Deal with $(bindir) and friends with whitespaces. · 4769948a
  Junio C Hamano authored Oct 10, 2005
  4769948a
Oct 02, 2005
- [PATCH] Teach the recursive merge strategy about renames. · af215114
  Fredrik Kuivinen authored Oct 2, 2005
  af215114
Sep 25, 2005
- [PATCH] recursive-merge: Don't print a stack trace when read-tree fails. · 0bed1899
  Fredrik Kuivinen authored Sep 25, 2005
  0bed1899
Sep 14, 2005
- git-merge-recursive: Trivial RE fixes. · 74376a68
  Junio C Hamano authored Sep 14, 2005
  74376a68
Sep 13, 2005
- [PATCH] Use a temporary index file when we merge the common ancestors. · 6511cce2
  Fredrik Kuivinen authored Sep 13, 2005
  6511cce2
- [PATCH] Adjust git-merge-recursive.py for the new tool names. · 87a71b65
  Fredrik Kuivinen authored Sep 13, 2005
  87a71b65
- [PATCH] Don't output 'Automatic merge failed, ...' · 0d214b66
  Fredrik Kuivinen authored Sep 13, 2005
  0d214b66
- [PATCH] Be more like the 'resolve' strategy. · d9a23fa6
  Fredrik Kuivinen authored Sep 13, 2005
  d9a23fa6
- [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. · e4cf17ce
  Fredrik Kuivinen authored Sep 13, 2005
  e4cf17ce
Sep 12, 2005
- [PATCH] Make sure we die if we don't get enough arguments. · 206e587c
  Fredrik Kuivinen authored Sep 12, 2005
  206e587c
- [PATCH] Introduce a 'die' function. · 654291a2
  Fredrik Kuivinen authored Sep 12, 2005
  654291a2
- [PATCH] Exit with status code 2 if we get an exception. · ace36858
  Fredrik Kuivinen authored Sep 12, 2005
  ace36858
- [PATCH] Fix assertion failure when merging common ancestors. · 8ceba720
  Fredrik Kuivinen authored Sep 12, 2005
  8ceba720
Sep 11, 2005
- Add a new merge strategy by Fredrik Kuivinen. · 720d150c
  Junio C Hamano authored Sep 11, 2005
  720d150c