summaryrefslogtreecommitdiff
path: root/builtin-revert.c
AgeCommit message (Expand)AuthorFilesLines
2010-03-06revert: add --ff option to allow fast forward when cherry-pickingLibravatar Junio C Hamano1-3/+40
2010-02-11cherry-pick: prettify the advice messageLibravatar Jeff King1-4/+6
2010-02-11cherry-pick: show commit name instead of sha1Libravatar Jeff King1-7/+7
2010-02-11cherry-pick: format help message as strbufLibravatar Jeff King1-4/+4
2010-02-11cherry-pick: refactor commit parsing codeLibravatar Jeff King1-8/+2
2010-02-11cherry-pick: rewrap advice messageLibravatar Jeff King1-4/+4
2010-01-20Merge branch 'mm/conflict-advice'Libravatar Junio C Hamano1-1/+14
2010-01-12Be more user-friendly when refusing to do something because of conflict.Libravatar Matthieu Moy1-1/+14
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsLibravatar Junio C Hamano1-1/+3
2009-06-27Use die_errno() instead of die() when checking syscallsLibravatar Thomas Rast1-1/+1
2009-05-31Merge branch 'sb/opt-filename'Libravatar Junio C Hamano1-1/+1
2009-05-25parse-opts: prepare for OPT_FILENAMELibravatar Stephen Boyd1-1/+1
2009-05-18Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibilityLibravatar Brandon Casey1-2/+2
2009-03-07Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano1-0/+1
2009-03-07builtin-revert.c: release index lock when cherry-picking an empty commitLibravatar Chris Johnsen1-0/+1
2009-02-10Generalize and libify index_is_dirty() to index_differs_from(...)Libravatar Stephan Beyer1-12/+1
2008-12-21git-revert: record the parent against which a revert was madeLibravatar Robin Rosenberg1-0/+5
2008-11-05Merge branch 'ar/mksnpath'Libravatar Junio C Hamano1-1/+1
2008-10-31Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2008-10-30Merge branch 'ar/maint-mksnpath' into ar/mksnpathLibravatar Junio C Hamano1-1/+1
2008-10-30Use git_pathdup instead of xstrdup(git_path(...))Libravatar Alex Riesen1-1/+1
2008-10-30Plug a memleak in builtin-revertLibravatar Alex Riesen1-1/+2
2008-10-21Merge branch 'jc/maint-co-track'Libravatar Junio C Hamano1-1/+2
2008-10-19Enhance hold_lock_file_for_{update,append}() APILibravatar Junio C Hamano1-1/+2
2008-09-02cherry-pick/revert: make direct internal call to merge_tree()Libravatar Miklos Vajna1-40/+43
2008-08-11Make cherry-pick use rerere for conflict resolution.Libravatar Abhijit Menon-Sen1-0/+2
2008-08-01Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2008-08-01builtin-revert.c: typofixLibravatar Stephan Beyer1-1/+1
2008-07-16Merge branch 'sb/dashless'Libravatar Junio C Hamano1-2/+2
2008-07-13Make usage strings dash-lessLibravatar Stephan Beyer1-2/+2
2008-07-07Allow cherry-picking root commitsLibravatar Johannes Schindelin1-10/+16
2008-05-14Provide git_config with a callback-data parameterLibravatar Johannes Schindelin1-1/+1
2008-04-26Allow cherry-pick (and revert) to add signoff lineLibravatar Dan McGee1-5/+15
2008-03-02Merge branch 'maint'Libravatar Junio C Hamano1-4/+16
2008-03-02revert: actually check for a dirty indexLibravatar Jeff King1-4/+16
2008-02-22Avoid unnecessary "if-before-free" tests.Libravatar Jim Meyering1-2/+1
2008-02-05Make error messages from cherry-pick/revert more sensibleLibravatar Junio C Hamano1-2/+3
2008-01-16Improve use of lockfile APILibravatar Brandon Casey1-2/+2
2007-11-30Mention that git-rm can be an appropriate resolution as well as git-add.Libravatar David Symonds1-1/+1
2007-11-30revert/cherry-pick: Allow overriding the help text by the calling PorcelainLibravatar Wincent Colaiuta1-10/+23
2007-11-25revert/cherry-pick: do not mention the original refLibravatar Junio C Hamano1-13/+1
2007-11-14Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2007-11-13Resurrect git-revert.sh example and add comment to builtin-revert.cLibravatar Junio C Hamano1-1/+3
2007-11-13revert/cherry-pick: allow starting from dirty work tree.Libravatar Junio C Hamano1-1/+1
2007-11-04Merge branch 'jc/revert-merge'Libravatar Junio C Hamano1-6/+29
2007-11-02Merge branch 'ph/parseopt'Libravatar Junio C Hamano1-37/+30
2007-10-30Merge branch 'maint' into HEADLibravatar Junio C Hamano1-1/+1
2007-10-30cherry-pick/revert: more compact user direction messageLibravatar Nicolas Pitre1-1/+1
2007-10-29Make builtin-revert.c use parse_options.Libravatar Pierre Habouzit1-37/+30
2007-10-26revert/cherry-pick: work on merge commits as wellLibravatar Junio C Hamano1-7/+35