aboutsummaryrefslogtreecommitdiff
path: root/builtin-revert.c
Commit message (Expand)AuthorAge
* Merge branch 'mm/conflict-advice'Junio C Hamano2010-01-20
|\
| * Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-12
* | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-04
|/
* Use die_errno() instead of die() when checking syscallsThomas Rast2009-06-27
* Merge branch 'sb/opt-filename'Junio C Hamano2009-05-31
|\
| * parse-opts: prepare for OPT_FILENAMEStephen Boyd2009-05-25
* | Use 'UTF-8' rather than 'utf-8' everywhere for backward compatibilityBrandon Casey2009-05-18
|/
* Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-07
|\
| * builtin-revert.c: release index lock when cherry-picking an empty commitChris Johnsen2009-03-07
* | Generalize and libify index_is_dirty() to index_differs_from(...)Stephan Beyer2009-02-10
|/
* git-revert: record the parent against which a revert was madeRobin Rosenberg2008-12-21
* Merge branch 'ar/mksnpath'Junio C Hamano2008-11-05
|\
| * Merge branch 'ar/maint-mksnpath' into ar/mksnpathJunio C Hamano2008-10-30
| |\
| | * Use git_pathdup instead of xstrdup(git_path(...))Alex Riesen2008-10-30
* | | Merge branch 'maint'Junio C Hamano2008-10-31
|\ \ \ | |/ / |/| |
| * | Plug a memleak in builtin-revertAlex Riesen2008-10-30
| |/
* | Merge branch 'jc/maint-co-track'Junio C Hamano2008-10-21
|\ \
| * | Enhance hold_lock_file_for_{update,append}() APIJunio C Hamano2008-10-19
| |/
* | cherry-pick/revert: make direct internal call to merge_tree()Miklos Vajna2008-09-02
* | Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen2008-08-11
|/
* Merge branch 'maint'Junio C Hamano2008-08-01
|\
| * builtin-revert.c: typofixStephan Beyer2008-08-01
* | Merge branch 'sb/dashless'Junio C Hamano2008-07-16
|\ \
| * | Make usage strings dash-lessStephan Beyer2008-07-13
| |/
* | Allow cherry-picking root commitsJohannes Schindelin2008-07-07
|/
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-14
* Allow cherry-pick (and revert) to add signoff lineDan McGee2008-04-26
* Merge branch 'maint'Junio C Hamano2008-03-02
|\
| * revert: actually check for a dirty indexJeff King2008-03-02
* | Avoid unnecessary "if-before-free" tests.Jim Meyering2008-02-22
* | Make error messages from cherry-pick/revert more sensibleJunio C Hamano2008-02-05
|/
* Improve use of lockfile APIBrandon Casey2008-01-16
* Mention that git-rm can be an appropriate resolution as well as git-add.David Symonds2007-11-30
* revert/cherry-pick: Allow overriding the help text by the calling PorcelainWincent Colaiuta2007-11-30
* revert/cherry-pick: do not mention the original refJunio C Hamano2007-11-25
* Merge branch 'maint'Junio C Hamano2007-11-14
|\
| * revert/cherry-pick: allow starting from dirty work tree.Junio C Hamano2007-11-13
* | Resurrect git-revert.sh example and add comment to builtin-revert.cJunio C Hamano2007-11-13
* | Merge branch 'jc/revert-merge'Junio C Hamano2007-11-04
|\ \
| * | revert/cherry-pick: work on merge commits as wellJunio C Hamano2007-10-26
* | | Merge branch 'ph/parseopt'Junio C Hamano2007-11-02
|\ \ \
| * | | Make builtin-revert.c use parse_options.Pierre Habouzit2007-10-29
| |/ /
* | | Merge branch 'maint' into HEADJunio C Hamano2007-10-30
|\ \ \ | |/ / |/| / | |/
| * cherry-pick/revert: more compact user direction messageNicolas Pitre2007-10-30
* | Use xmemdupz() in many places.Pierre Habouzit2007-09-18
|/
* More staticJunio C Hamano2007-06-13
* Missing statics.Pierre Habouzit2007-06-08
* Fix command line parameter parser of revert/cherry-pickJunio C Hamano2007-05-23
* Correct error message in revert/cherry-pickShawn O. Pearce2007-05-10
* Use .git/MERGE_MSG in cherry-pick/revertShawn O. Pearce2007-05-08