diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-27 00:15:24 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-27 00:15:24 +0400 |
| commit | 183f88018a849ae755b1efb7b63c58e38368e60f (patch) | |
| tree | bda282f98cefd5cec0c9e780a5c069a3d0edaf42 /Documentation | |
| parent | 7f95f2dce01e03532206d0998bca4cbdd8a660c7 (diff) | |
| parent | 4fa5c0591a7b5c71c8ccf71d8401c3337b7867ad (diff) | |
Merge branch 'kb/p4merge'
Adjust the order mergetools feeds the files to the p4merge backend
to match the p4 convention.
* kb/p4merge:
merge-one-file: force content conflict for "both sides added" case
git-merge-one-file: send "ERROR:" messages to stderr
git-merge-one-file: style cleanup
merge-one-file: remove stale comment
mergetools/p4merge: create a base if none available
mergetools/p4merge: swap LOCAL and REMOTE
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-sh-setup.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-sh-setup.txt b/Documentation/git-sh-setup.txt index 6a9f66d1d9..5d709d02c3 100644 --- a/Documentation/git-sh-setup.txt +++ b/Documentation/git-sh-setup.txt @@ -82,6 +82,12 @@ get_author_ident_from_commit:: outputs code for use with eval to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL and GIT_AUTHOR_DATE variables for a given commit. +create_virtual_base:: + modifies the first file so only lines in common with the + second file remain. If there is insufficient common material, + then the first file is left empty. The result is suitable + as a virtual base input for a 3-way merge. + GIT --- Part of the linkgit:git[1] suite |