summaryrefslogtreecommitdiff
path: root/builtin-revert.c
Commit message (Expand)AuthorAgeFilesLines
* Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-041-1/+3
* Use die_errno() instead of die() when checking syscallsThomas Rast2009-06-271-1/+1
* Merge branch 'sb/opt-filename'Junio C Hamano2009-05-311-1/+1
|\
| * parse-opts: prepare for OPT_FILENAMEStephen Boyd2009-05-251-1/+1
* | Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibilityBrandon Casey2009-05-181-2/+2
|/
* Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-071-0/+1
|\
| * builtin-revert.c: release index lock when cherry-picking an empty commitChris Johnsen2009-03-071-0/+1
* | Generalize and libify index_is_dirty() to index_differs_from(...)Stephan Beyer2009-02-101-12/+1
|/
* git-revert: record the parent against which a revert was madeRobin Rosenberg2008-12-211-0/+5
* Merge branch 'ar/mksnpath'Junio C Hamano2008-11-051-1/+1
|\
| * Merge branch 'ar/maint-mksnpath' into ar/mksnpathJunio C Hamano2008-10-301-1/+1
| |\
| | * Use git_pathdup instead of xstrdup(git_path(...))Alex Riesen2008-10-301-1/+1
* | | Merge branch 'maint'Junio C Hamano2008-10-311-1/+2
|\ \ \ | |/ / |/| |
| * | Plug a memleak in builtin-revertAlex Riesen2008-10-301-1/+2
| |/
* | Merge branch 'jc/maint-co-track'Junio C Hamano2008-10-211-1/+2
|\ \
| * | Enhance hold_lock_file_for_{update,append}() APIJunio C Hamano2008-10-191-1/+2
| |/
* | cherry-pick/revert: make direct internal call to merge_tree()Miklos Vajna2008-09-021-40/+43
* | Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen2008-08-111-0/+2
|/
* Merge branch 'maint'Junio C Hamano2008-08-011-1/+1
|\
| * builtin-revert.c: typofixStephan Beyer2008-08-011-1/+1
* | Merge branch 'sb/dashless'Junio C Hamano2008-07-161-2/+2
|\ \
| * | Make usage strings dash-lessStephan Beyer2008-07-131-2/+2
| |/
* | Allow cherry-picking root commitsJohannes Schindelin2008-07-071-10/+16
|/
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-1/+1
* Allow cherry-pick (and revert) to add signoff lineDan McGee2008-04-261-5/+15
* Merge branch 'maint'Junio C Hamano2008-03-021-4/+16
|\
| * revert: actually check for a dirty indexJeff King2008-03-021-4/+16
* | Avoid unnecessary "if-before-free" tests.Jim Meyering2008-02-221-2/+1
* | Make error messages from cherry-pick/revert more sensibleJunio C Hamano2008-02-051-2/+3
|/
* Improve use of lockfile APIBrandon Casey2008-01-161-2/+2
* Mention that git-rm can be an appropriate resolution as well as git-add.David Symonds2007-11-301-1/+1
* revert/cherry-pick: Allow overriding the help text by the calling PorcelainWincent Colaiuta2007-11-301-10/+23
* revert/cherry-pick: do not mention the original refJunio C Hamano2007-11-251-13/+1
* Merge branch 'maint'Junio C Hamano2007-11-141-1/+1
|\
| * revert/cherry-pick: allow starting from dirty work tree.Junio C Hamano2007-11-131-1/+1
* | Resurrect git-revert.sh example and add comment to builtin-revert.cJunio C Hamano2007-11-131-1/+3
* | Merge branch 'jc/revert-merge'Junio C Hamano2007-11-041-6/+29
|\ \
| * | revert/cherry-pick: work on merge commits as wellJunio C Hamano2007-10-261-7/+35
* | | Merge branch 'ph/parseopt'Junio C Hamano2007-11-021-37/+30
|\ \ \
| * | | Make builtin-revert.c use parse_options.Pierre Habouzit2007-10-291-37/+30
| |/ /
* | | Merge branch 'maint' into HEADJunio C Hamano2007-10-301-1/+1
|\ \ \ | |/ / |/| / | |/
| * cherry-pick/revert: more compact user direction messageNicolas Pitre2007-10-301-1/+1
* | Use xmemdupz() in many places.Pierre Habouzit2007-09-181-3/+1
|/
* More staticJunio C Hamano2007-06-131-2/+2
* Missing statics.Pierre Habouzit2007-06-081-1/+1
* Fix command line parameter parser of revert/cherry-pickJunio C Hamano2007-05-231-2/+5
* Correct error message in revert/cherry-pickShawn O. Pearce2007-05-101-1/+1
* Use .git/MERGE_MSG in cherry-pick/revertShawn O. Pearce2007-05-081-11/+6
* git-revert: Revert revert message to old behaviourJohannes Schindelin2007-03-241-5/+5
* Correct new compiler warnings in builtin-revertShawn O. Pearce2007-03-121-2/+2
View Lorry Controller Status