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