summaryrefslogtreecommitdiff
path: root/Documentation/git-fmt-merge-msg.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-05 12:36:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-05 12:36:19 -0700
commitcd4093b6036af696310b1867e9e916485d53ccf4 (patch)
tree23449c4e6c0d02bdfd050707747168fe936e5048 /Documentation/git-fmt-merge-msg.txt
parentMerge branch 'da/make-auto-header-dependencies' (diff)
parentbuiltin/revert.c: make commit_list_append() static (diff)
downloadtgif-cd4093b6036af696310b1867e9e916485d53ccf4.tar.xz
Merge branch 'rr/revert-cherry-pick-continue'
* rr/revert-cherry-pick-continue: builtin/revert.c: make commit_list_append() static revert: Propagate errors upwards from do_pick_commit revert: Introduce --continue to continue the operation revert: Don't implicitly stomp pending sequencer operation revert: Remove sequencer state when no commits are pending reset: Make reset remove the sequencer state revert: Introduce --reset to remove sequencer state revert: Make pick_commits functionally act on a commit list revert: Save command-line options for continuing operation revert: Save data for continuing after conflict resolution revert: Don't create invalid replay_opts in parse_args revert: Separate cmdline parsing from functional code revert: Introduce struct to keep command-line options revert: Eliminate global "commit" variable revert: Rename no_replay to record_origin revert: Don't check lone argument in get_encoding revert: Simplify and inline add_message_to_msg config: Introduce functions to write non-standard file advice: Introduce error_resolve_conflict
Diffstat (limited to 'Documentation/git-fmt-merge-msg.txt')
0 files changed, 0 insertions, 0 deletions