| Commit message (Expand) | Author | Age | Files | Lines |
* | refactor duplicated fill_mm() in checkout and merge-recursive | Michael Lukashov | 2010-02-17 | 1 | -20/+3 |
* | Merge branch 'maint' | Junio C Hamano | 2010-01-21 | 1 | -4/+4 |
|\ |
|
| * | merge-recursive: do not return NULL only to cause segfault | Junio C Hamano | 2010-01-21 | 1 | -4/+4 |
* | | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 | 1 | -10/+29 |
|\ \
| |/
|/| |
|
| * | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano | 2010-01-17 | 1 | -9/+11 |
| * | git merge -X<option> | Avery Pennarun | 2010-01-17 | 1 | -2/+19 |
* | | Merge branch 'mm/maint-merge-ff-error-message-fix' | Junio C Hamano | 2009-11-30 | 1 | -18/+23 |
|\ \
| |/
|/| |
|
| * | merge-recursive: make the error-message generation an extern function | Matthieu Moy | 2009-11-29 | 1 | -13/+18 |
* | | Merge branch 'mm/maint-hint-failed-merge' | Junio C Hamano | 2009-11-23 | 1 | -1/+7 |
|\ \ |
|
| * | | merge-recursive: point the user to commit when file would be overwritten. | Matthieu Moy | 2009-11-22 | 1 | -1/+7 |
| |/ |
|
* | | Check the format of more printf-type functions | Tarmigan Casebolt | 2009-11-15 | 1 | -1/+3 |
|/ |
|
* | merge-recursive: give less scary messages when merge did not start | Junio C Hamano | 2009-09-08 | 1 | -4/+21 |
* | Merge branch 'jc/maint-merge-recursive-fix' | Junio C Hamano | 2009-08-10 | 1 | -3/+25 |
|\ |
|
| * | merge-recursive: don't segfault while handling rename clashes | Junio C Hamano | 2009-07-30 | 1 | -3/+25 |
| * | Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint | Junio C Hamano | 2009-01-13 | 1 | -0/+5 |
| |\ |
|
| * \ | Merge branch 'cb/maint-merge-recursive-fix' into maint | Junio C Hamano | 2009-01-13 | 1 | -0/+32 |
| |\ \ |
|
* | \ \ | Merge branch 'tr/die_errno' | Junio C Hamano | 2009-07-06 | 1 | -3/+3 |
|\ \ \ \ |
|
| * | | | | Convert existing die(..., strerror(errno)) to die_errno() | Thomas Rast | 2009-06-27 | 1 | -3/+3 |
* | | | | | Remove filename from conflict markers | Martin Renold | 2009-07-01 | 1 | -2/+7 |
* | | | | | Fix various sparse warnings in the git source code | Linus Torvalds | 2009-06-20 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Merge branch 'do/maint-merge-recursive-fix' | Junio C Hamano | 2009-05-23 | 1 | -5/+6 |
|\ \ \ \ |
|
| * | | | | merge-recursive: never leave index unmerged while recursing | Dave Olszewski | 2009-05-09 | 1 | -5/+6 |
* | | | | | merge-recursive: do not die on a conflicting submodule | Junio C Hamano | 2009-04-29 | 1 | -2/+6 |
* | | | | | Merge branch 'cb/maint-merge-recursive-submodule-fix' | Junio C Hamano | 2009-04-07 | 1 | -12/+4 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | simplify output of conflicting merge | Clemens Buchacher | 2009-04-05 | 1 | -13/+4 |
| * | | | | update cache for conflicting submodule entries | Clemens Buchacher | 2009-04-05 | 1 | -2/+3 |
* | | | | | Fix various dead stores found by the clang static analyzer | Benjamin Kramer | 2009-03-15 | 1 | -8/+3 |
|/ / / / |
|
* | | | | tree.c: allow read_tree_recursive() to traverse gitlink entries | Lars Hjemli | 2009-02-07 | 1 | -1/+1 |
* | | | | Merge branch 'js/maint-merge-recursive-r-d-conflict' | Junio C Hamano | 2009-01-07 | 1 | -0/+5 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | merge-recursive: mark rename/delete conflict as unmerged | Johannes Schindelin | 2008-12-24 | 1 | -0/+5 |
| |/ / |
|
* | | | Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix | Junio C Hamano | 2008-12-15 | 1 | -0/+32 |
|\ \ \
| |/ /
|/| /
| |/ |
|
* | | Report symlink failures in merge-recursive | Alex Riesen | 2008-12-04 | 1 | -1/+2 |
* | | merge-recursive: use strbuf_expand() instead of interpolate() | René Scharfe | 2008-11-23 | 1 | -1/+0 |
* | | git-merge-recursive: honor merge.conflictstyle once again | Matt McCutchen | 2008-10-19 | 1 | -1/+1 |
* | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer | Brandon Casey | 2008-10-12 | 1 | -2/+1 |
* | | Merge branch 'bc/master-diff-hunk-header-fix' | Shawn O. Pearce | 2008-09-29 | 1 | -16/+1 |
|\ \
| |/ |
|
* | | Merge branch 'maint' | Shawn O. Pearce | 2008-09-26 | 1 | -3/+1 |
|\ \
| |/ |
|
* | | Cleanup remove_path | Alex Riesen | 2008-09-26 | 1 | -5/+3 |
* | | merge-recursive: get rid of virtual_id | Miklos Vajna | 2008-09-05 | 1 | -5/+1 |
* | | merge-recursive: move current_{file,directory}_set to struct merge_options | Miklos Vajna | 2008-09-04 | 1 | -27/+30 |
* | | merge-recursive: move the global obuf to struct merge_options | Miklos Vajna | 2008-09-04 | 1 | -19/+18 |
* | | merge-recursive: get rid of the index_only global variable | Miklos Vajna | 2008-09-04 | 1 | -73/+67 |
* | | merge-recursive: move call_depth to struct merge_options | Miklos Vajna | 2008-09-03 | 1 | -13/+12 |
* | | merge-recursive: introduce merge_options | Miklos Vajna | 2008-08-30 | 1 | -132/+133 |
* | | merge-recursive.c: Add more generic merge_recursive_generic() | Stephan Beyer | 2008-08-30 | 1 | -0/+53 |
* | | Split out merge_recursive() to merge-recursive.c | Miklos Vajna | 2008-08-30 | 1 | -0/+1331 |
|/ |
|
* | Build-in merge-recursive | Daniel Barkalow | 2008-02-09 | 1 | -1760/+0 |
* | Make on-disk index representation separate from in-core one | Linus Torvalds | 2008-01-21 | 1 | -1/+1 |
* | Improve use of lockfile API | Brandon Casey | 2008-01-16 | 1 | -1/+1 |
* | Fix grammar nits in documentation and in code comments. | Jim Meyering | 2008-01-03 | 1 | -1/+1 |