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