aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-revert.c
AgeCommit message (Expand)AuthorFilesLines
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-460/+0
2010-02-11cherry-pick: prettify the advice messageJeff King1-4/+6
2010-02-11cherry-pick: show commit name instead of sha1Jeff King1-7/+7
2010-02-11cherry-pick: format help message as strbufJeff King1-4/+4
2010-02-11cherry-pick: refactor commit parsing codeJeff King1-8/+2
2010-02-11cherry-pick: rewrap advice messageJeff King1-4/+4
2010-01-20Merge branch 'mm/conflict-advice'Junio C Hamano1-1/+14
2010-01-12Be more user-friendly when refusing to do something because of conflict.Matthieu Moy1-1/+14
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano1-1/+3
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast1-1/+1
2009-05-31Merge branch 'sb/opt-filename'Junio C Hamano1-1/+1
2009-05-25parse-opts: prepare for OPT_FILENAMEStephen Boyd1-1/+1
2009-05-18Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibilityBrandon Casey1-2/+2
2009-03-07Merge branch 'maint-1.6.1' into maintJunio C Hamano1-0/+1
2009-03-07builtin-revert.c: release index lock when cherry-picking an empty commitChris Johnsen1-0/+1
2009-02-10Generalize and libify index_is_dirty() to index_differs_from(...)Stephan Beyer1-12/+1
2008-12-21git-revert: record the parent against which a revert was madeRobin Rosenberg1-0/+5
2008-11-05Merge branch 'ar/mksnpath'Junio C Hamano1-1/+1
2008-10-31Merge branch 'maint'Junio C Hamano1-1/+2
2008-10-30Merge branch 'ar/maint-mksnpath' into ar/mksnpathJunio C Hamano1-1/+1
2008-10-30Use git_pathdup instead of xstrdup(git_path(...))Alex Riesen1-1/+1
2008-10-30Plug a memleak in builtin-revertAlex Riesen1-1/+2
2008-10-21Merge branch 'jc/maint-co-track'Junio C Hamano1-1/+2
2008-10-19Enhance hold_lock_file_for_{update,append}() APIJunio C Hamano1-1/+2
2008-09-02cherry-pick/revert: make direct internal call to merge_tree()Miklos Vajna1-40/+43
2008-08-11Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen1-0/+2
2008-08-01Merge branch 'maint'Junio C Hamano1-1/+1
2008-08-01builtin-revert.c: typofixStephan Beyer1-1/+1
2008-07-16Merge branch 'sb/dashless'Junio C Hamano1-2/+2
2008-07-13Make usage strings dash-lessStephan Beyer1-2/+2
2008-07-07Allow cherry-picking root commitsJohannes Schindelin1-10/+16
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin1-1/+1
2008-04-26Allow cherry-pick (and revert) to add signoff lineDan McGee1-5/+15
2008-03-02Merge branch 'maint'Junio C Hamano1-4/+16
2008-03-02revert: actually check for a dirty indexJeff King1-4/+16
2008-02-22Avoid unnecessary "if-before-free" tests.Jim Meyering1-2/+1
2008-02-05Make error messages from cherry-pick/revert more sensibleJunio C Hamano1-2/+3
2008-01-16Improve use of lockfile APIBrandon Casey1-2/+2
2007-11-30Mention that git-rm can be an appropriate resolution as well as git-add.David Symonds1-1/+1
2007-11-30revert/cherry-pick: Allow overriding the help text by the calling PorcelainWincent Colaiuta1-10/+23
2007-11-25revert/cherry-pick: do not mention the original refJunio C Hamano1-13/+1
2007-11-14Merge branch 'maint'Junio C Hamano1-1/+1
2007-11-13Resurrect git-revert.sh example and add comment to builtin-revert.cJunio C Hamano1-1/+3
2007-11-13revert/cherry-pick: allow starting from dirty work tree.Junio C Hamano1-1/+1
2007-11-04Merge branch 'jc/revert-merge'Junio C Hamano1-6/+29
2007-11-02Merge branch 'ph/parseopt'Junio C Hamano1-37/+30
2007-10-30Merge branch 'maint' into HEADJunio C Hamano1-1/+1
2007-10-30cherry-pick/revert: more compact user direction messageNicolas Pitre1-1/+1
2007-10-29Make builtin-revert.c use parse_options.Pierre Habouzit1-37/+30
2007-10-26revert/cherry-pick: work on merge commits as wellJunio C Hamano1-7/+35
2007-09-18Use xmemdupz() in many places.Pierre Habouzit1-3/+1
2007-06-13More staticJunio C Hamano1-2/+2
2007-06-08Missing statics.Pierre Habouzit1-1/+1
2007-05-23Fix command line parameter parser of revert/cherry-pickJunio C Hamano1-2/+5
2007-05-10Correct error message in revert/cherry-pickShawn O. Pearce1-1/+1
2007-05-08Use .git/MERGE_MSG in cherry-pick/revertShawn O. Pearce1-11/+6
2007-03-24git-revert: Revert revert message to old behaviourJohannes Schindelin1-5/+5
2007-03-12Correct new compiler warnings in builtin-revertShawn O. Pearce1-2/+2
2007-03-11Switch to run_command_v_opt in revertShawn O. Pearce1-4/+9
2007-03-05cherry-pick: Bug fix 'cherry picked from' message.Shawn O. Pearce1-2/+2
2007-03-04cherry-pick: Suggest a better method to retain authorshipJohannes Schindelin1-13/+6
2007-03-03Make git-revert & git-cherry-pick a builtinJohannes Schindelin1-0/+406