Age | Commit message (Expand) | Author | Files | Lines |
2010-01-20 | Merge branch 'mm/conflict-advice' | Junio C Hamano | 1 | -1/+14 |
2010-01-12 | Be more user-friendly when refusing to do something because of conflict. | Matthieu Moy | 1 | -1/+14 |
2009-12-04 | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 1 | -1/+3 |
2009-06-27 | Use die_errno() instead of die() when checking syscalls | Thomas Rast | 1 | -1/+1 |
2009-05-31 | Merge branch 'sb/opt-filename' | Junio C Hamano | 1 | -1/+1 |
2009-05-25 | parse-opts: prepare for OPT_FILENAME | Stephen Boyd | 1 | -1/+1 |
2009-05-18 | Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibility | Brandon Casey | 1 | -2/+2 |
2009-03-07 | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 1 | -0/+1 |
2009-03-07 | builtin-revert.c: release index lock when cherry-picking an empty commit | Chris Johnsen | 1 | -0/+1 |
2009-02-10 | Generalize and libify index_is_dirty() to index_differs_from(...) | Stephan Beyer | 1 | -12/+1 |
2008-12-21 | git-revert: record the parent against which a revert was made | Robin Rosenberg | 1 | -0/+5 |
2008-11-05 | Merge branch 'ar/mksnpath' | Junio C Hamano | 1 | -1/+1 |
2008-10-31 | Merge branch 'maint' | Junio C Hamano | 1 | -1/+2 |
2008-10-30 | Merge branch 'ar/maint-mksnpath' into ar/mksnpath | Junio C Hamano | 1 | -1/+1 |
2008-10-30 | Use git_pathdup instead of xstrdup(git_path(...)) | Alex Riesen | 1 | -1/+1 |
2008-10-30 | Plug a memleak in builtin-revert | Alex Riesen | 1 | -1/+2 |
2008-10-21 | Merge branch 'jc/maint-co-track' | Junio C Hamano | 1 | -1/+2 |
2008-10-19 | Enhance hold_lock_file_for_{update,append}() API | Junio C Hamano | 1 | -1/+2 |
2008-09-02 | cherry-pick/revert: make direct internal call to merge_tree() | Miklos Vajna | 1 | -40/+43 |
2008-08-11 | Make cherry-pick use rerere for conflict resolution. | Abhijit Menon-Sen | 1 | -0/+2 |
2008-08-01 | Merge branch 'maint' | Junio C Hamano | 1 | -1/+1 |
2008-08-01 | builtin-revert.c: typofix | Stephan Beyer | 1 | -1/+1 |
2008-07-16 | Merge branch 'sb/dashless' | Junio C Hamano | 1 | -2/+2 |
2008-07-13 | Make usage strings dash-less | Stephan Beyer | 1 | -2/+2 |
2008-07-07 | Allow cherry-picking root commits | Johannes Schindelin | 1 | -10/+16 |
2008-05-14 | Provide git_config with a callback-data parameter | Johannes Schindelin | 1 | -1/+1 |
2008-04-26 | Allow cherry-pick (and revert) to add signoff line | Dan McGee | 1 | -5/+15 |
2008-03-02 | Merge branch 'maint' | Junio C Hamano | 1 | -4/+16 |
2008-03-02 | revert: actually check for a dirty index | Jeff King | 1 | -4/+16 |
2008-02-22 | Avoid unnecessary "if-before-free" tests. | Jim Meyering | 1 | -2/+1 |
2008-02-05 | Make error messages from cherry-pick/revert more sensible | Junio C Hamano | 1 | -2/+3 |
2008-01-16 | Improve use of lockfile API | Brandon Casey | 1 | -2/+2 |
2007-11-30 | Mention that git-rm can be an appropriate resolution as well as git-add. | David Symonds | 1 | -1/+1 |
2007-11-30 | revert/cherry-pick: Allow overriding the help text by the calling Porcelain | Wincent Colaiuta | 1 | -10/+23 |
2007-11-25 | revert/cherry-pick: do not mention the original ref | Junio C Hamano | 1 | -13/+1 |
2007-11-14 | Merge branch 'maint' | Junio C Hamano | 1 | -1/+1 |
2007-11-13 | Resurrect git-revert.sh example and add comment to builtin-revert.c | Junio C Hamano | 1 | -1/+3 |
2007-11-13 | revert/cherry-pick: allow starting from dirty work tree. | Junio C Hamano | 1 | -1/+1 |
2007-11-04 | Merge branch 'jc/revert-merge' | Junio C Hamano | 1 | -6/+29 |
2007-11-02 | Merge branch 'ph/parseopt' | Junio C Hamano | 1 | -37/+30 |
2007-10-30 | Merge branch 'maint' into HEAD | Junio C Hamano | 1 | -1/+1 |
2007-10-30 | cherry-pick/revert: more compact user direction message | Nicolas Pitre | 1 | -1/+1 |
2007-10-29 | Make builtin-revert.c use parse_options. | Pierre Habouzit | 1 | -37/+30 |
2007-10-26 | revert/cherry-pick: work on merge commits as well | Junio C Hamano | 1 | -7/+35 |
2007-09-18 | Use xmemdupz() in many places. | Pierre Habouzit | 1 | -3/+1 |
2007-06-13 | More static | Junio C Hamano | 1 | -2/+2 |
2007-06-08 | Missing statics. | Pierre Habouzit | 1 | -1/+1 |
2007-05-23 | Fix command line parameter parser of revert/cherry-pick | Junio C Hamano | 1 | -2/+5 |
2007-05-10 | Correct error message in revert/cherry-pick | Shawn O. Pearce | 1 | -1/+1 |
2007-05-08 | Use .git/MERGE_MSG in cherry-pick/revert | Shawn O. Pearce | 1 | -11/+6 |