summaryrefslogtreecommitdiff
path: root/Documentation/git-format-patch.txt
diff options
context:
space:
mode:
authorXiaolong Ye <xiaolong.ye@intel.com>2016-04-26 07:51:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-26 17:51:50 (GMT)
commit3de665175f3433ccd1dadd4d5d09fa9553948e55 (patch)
tree41b30294951a8a74f3aa46daed76ee1594b9feee /Documentation/git-format-patch.txt
parentfa2ab86d18f16ab5e6d2f2cd6e8cc00460bada17 (diff)
downloadgit-3de665175f3433ccd1dadd4d5d09fa9553948e55.zip
git-3de665175f3433ccd1dadd4d5d09fa9553948e55.tar.gz
git-3de665175f3433ccd1dadd4d5d09fa9553948e55.tar.bz2
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 <gitster@pobox.com> Helped-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-format-patch.txt')
-rw-r--r--Documentation/git-format-patch.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 1d790f1..bdeecd5 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
--------