From 3de665175f3433ccd1dadd4d5d09fa9553948e55 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Tue, 26 Apr 2016 15:51:23 +0800 Subject: format-patch: introduce --base=auto option Introduce --base=auto to record the base commit info automatically, the base_commit will be the merge base of tip commit of the upstream branch and revision-range specified in cmdline. Helped-by: Junio C Hamano Helped-by: Wu Fengguang Signed-off-by: Xiaolong Ye Signed-off-by: Junio C Hamano --- Documentation/git-format-patch.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Documentation/git-format-patch.txt') diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 1d790f1af5..bdeecd59e0 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -575,6 +575,12 @@ You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message. +If set `--base=auto` in cmdline, it will track base commit automatically, +the base commit will be the merge base of tip commit of the remote-tracking +branch and revision-range specified in cmdline. +For a local branch, you need to track a remote branch by `git branch +--set-upstream-to` before using this option. + EXAMPLES -------- -- cgit v1.3