summaryrefslogtreecommitdiff
path: root/builtin/revert.c
Commit message (Expand)AuthorAgeFilesLines
* do not let git_path clobber errno when reporting errorsjn/git-path-errnoJonathan Nieder2011-11-171-4/+5
* revert: prettify fatal messagesRamkumar Ramachandra2011-11-151-5/+5
* Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-191-7/+16
|\
| * Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-061-7/+16
| |\
| | * cherry-pick: do not give irrelevant advice when cherry-pick puntedjs/maint-no-cherry-pick-head-after-puntedJay Soffian2011-10-061-5/+7
| | * revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-061-2/+9
* | | Merge branch 'jc/parse-options-boolean'Junio C Hamano2011-10-121-3/+1
|\ \ \
| * | | revert: use OPT_NOOP_NOARGRené Scharfe2011-09-281-3/+1
* | | | Fix some "variable might be used uninitialized" warningsRamsay Jones2011-10-091-1/+1
| |/ / |/| |
* | | Merge branch 'rr/revert-cherry-pick-continue'Junio C Hamano2011-10-051-154/+583
|\ \ \ | |/ / |/| |
| * | builtin/revert.c: make commit_list_append() staticJunio C Hamano2011-09-111-2/+2
| * | revert: Propagate errors upwards from do_pick_commitRamkumar Ramachandra2011-08-081-46/+40
| * | revert: Introduce --continue to continue the operationRamkumar Ramachandra2011-08-081-4/+184
| * | revert: Don't implicitly stomp pending sequencer operationRamkumar Ramachandra2011-08-081-5/+25
| * | revert: Remove sequencer state when no commits are pendingRamkumar Ramachandra2011-08-081-1/+11
| * | revert: Introduce --reset to remove sequencer stateRamkumar Ramachandra2011-08-041-19/+43
| * | revert: Make pick_commits functionally act on a commit listRamkumar Ramachandra2011-08-041-15/+28
| * | revert: Save command-line options for continuing operationRamkumar Ramachandra2011-08-041-0/+33
| * | revert: Save data for continuing after conflict resolutionRamkumar Ramachandra2011-08-041-4/+130
| * | revert: Don't create invalid replay_opts in parse_argsRamkumar Ramachandra2011-08-041-11/+27
| * | revert: Separate cmdline parsing from functional codeRamkumar Ramachandra2011-08-041-7/+7
| * | revert: Introduce struct to keep command-line optionsRamkumar Ramachandra2011-08-041-88/+113
| * | revert: Eliminate global "commit" variableRamkumar Ramachandra2011-08-041-11/+11
| * | revert: Rename no_replay to record_originRamkumar Ramachandra2011-08-041-4/+4
| * | revert: Don't check lone argument in get_encodingRamkumar Ramachandra2011-08-041-3/+0
| * | revert: Simplify and inline add_message_to_msgRamkumar Ramachandra2011-08-041-14/+14
| * | advice: Introduce error_resolve_conflictRamkumar Ramachandra2011-08-041-9/+0
| |/
* | Merge branch 'jn/plug-empty-tree-leak'Junio C Hamano2011-08-251-6/+1
|\ \ | |/ |/|
| * revert: plug memory leak in "cherry-pick root commit" codepathJonathan Nieder2011-08-161-6/+1
* | revert: allow reverting a root commitJeff King2011-05-161-3/+1
* | revert: Hide '-r' option in default usageRamkumar Ramachandra2011-04-131-1/+2
* | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-30/+42
|\ \
| * | i18n: git-revert split up "could not revert/apply" messageÆvar Arnfjörð Bjarmason2011-03-091-2/+3
| * | i18n: git-revert literal "me" messagesÆvar Arnfjörð Bjarmason2011-03-091-2/+5
| * | i18n: git-revert "Your local changes" messageÆvar Arnfjörð Bjarmason2011-03-091-5/+13
| * | i18n: git-revert basic messagesÆvar Arnfjörð Bjarmason2011-03-091-23/+23
* | | Merge branch 'js/cherry-pick-usability'Junio C Hamano2011-03-091-53/+22
|\ \ \ | |/ / |/| |
| * | Teach commit about CHERRY_PICK_HEADJay Soffian2011-02-211-55/+1
| * | Introduce CHERRY_PICK_HEADJay Soffian2011-02-211-2/+25
* | | cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder2010-12-281-7/+22
|/ /
* | Merge branch 'jn/cherry-pick-refresh-index'Junio C Hamano2010-11-291-2/+16
|\ \
| * | cherry-pick/revert: transparently refresh indexJonathan Nieder2010-11-101-2/+16
* | | builtin/revert.c: don't dereference a NULL pointerBrandon Casey2010-09-271-1/+1
|/ /
* | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-031-0/+7
|\ \
| * | merge-recursive --renormalizeJonathan Nieder2010-08-061-0/+7
| |/
* | Merge branch 'jn/cherry-revert-message-clean-up'Junio C Hamano2010-08-311-69/+70
|\ \
| * | cherry-pick/revert: Use advise() for hintsJonathan Nieder2010-08-151-23/+11
| * | cherry-pick/revert: Use error() for failure messageJonathan Nieder2010-08-151-2/+5
| * | Introduce advise() to print hintsJonathan Nieder2010-08-151-0/+9
| * | Eliminate “Finished cherry-pick/revert” messageJonathan Nieder2010-08-151-2/+0
View Lorry Controller Status