delta/git.git, branch xy/format-patch-base

doc: trivial typo in git-format-patch.txt

2017-04-18T03:25:12+00:00

Signed-off-by: Giuseppe Bilotta 
Reviewed-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

format-patch: introduce format.useAutoBase configuration

2016-04-26T17:52:57+00:00

This allows to record the base commit automatically, it is equivalent
to set --base=auto in cmdline.

The format.useAutoBase has lower priority than command line option,
so if user set format.useAutoBase and pass the command line option in
the meantime, base_commit will be the one passed to command line
option.

Signed-off-by: Xiaolong Ye 
Signed-off-by: Junio C Hamano

format-patch: introduce --base=auto option

2016-04-26T17:51:50+00:00

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

format-patch: add '--base' option to record base tree info

2016-04-26T17:50:13+00:00

Maintainers or third party testers may want to know the exact base tree
the patch series applies to. Teach git format-patch a '--base' option
to record the base tree info and append it at the end of the first
message (either the cover letter or the first patch in the series).

The base tree info consists of the "base commit", which is a well-known
commit that is part of the stable part of the project history everybody
else works off of, and zero or more "prerequisite patches", which are
well-known patches in flight that is not yet part of the "base commit"
that need to be applied on top of "base commit" in topological order
before the patches can be applied.

The "base commit" is shown as "base-commit: " followed by the 40-hex of
the commit object name.  A "prerequisite patch" is shown as
"prerequisite-patch-id: " followed by the 40-hex "patch id", which can
be obtained by passing the patch through the "git patch-id --stable"
command.

Imagine that on top of the public commit P, you applied well-known
patches X, Y and Z from somebody else, and then built your three-patch
series A, B, C, the history would be like:

---P---X---Y---Z---A---B---C

With "git format-patch --base=P -3 C" (or variants thereof, e.g. with
"--cover-letter" of using "Z..C" instead of "-3 C" to specify the
range), the base tree information block is shown at the end of the
first message the command outputs (either the first patch, or the
cover letter), like this:

base-commit: P
prerequisite-patch-id: X
prerequisite-patch-id: Y
prerequisite-patch-id: Z

Helped-by: Junio C Hamano 
Helped-by: Wu Fengguang 
Signed-off-by: Xiaolong Ye 
Signed-off-by: Junio C Hamano

patch-ids: make commit_patch_id() a public helper function

2016-04-26T17:49:57+00:00

Make commit_patch_id() available to other builtins.

Signed-off-by: Xiaolong Ye 
Signed-off-by: Junio C Hamano

Git 2.8

2016-03-28T19:19:45+00:00

Signed-off-by: Junio C Hamano

Merge branch 'ls/p4-doc-markup'

2016-03-24T19:28:06+00:00

* ls/p4-doc-markup:
  Documentation: fix git-p4 AsciiDoc formatting
  Documentation: use ASCII quotation marks in git-p4

Merge branch 'js/mingw-tests-2.8'

2016-03-24T19:27:58+00:00

* js/mingw-tests-2.8:
  mingw: skip some tests in t9115 due to file name issues
  t1300: fix the new --show-origin tests on Windows
  t1300-repo-config: make it resilient to being run via 'sh -x'
  config --show-origin: report paths with forward slashes

Merge branch 'sb/submodule-module-list-pathspec-fix'

2016-03-24T19:27:13+00:00

A fix for a small regression in "module_list" helper that was
rewritten in C (also applies to 2.7.x).

* sb/submodule-module-list-pathspec-fix:
  submodule: fix regression for deinit without submodules

Merge branch 'master' of git://github.com/git-l10n/git-po

2016-03-23T19:22:42+00:00

* 'master' of git://github.com/git-l10n/git-po:
  l10n: pt_PT: Update and add new translations
  l10n: ca.po: update translation
  l10n: vi.po (2530t): Update translation