mirror of
https://github.com/git/git.git
synced 2024-05-08 12:06:09 +02:00
a6080a0a44
This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
30 lines
623 B
Plaintext
30 lines
623 B
Plaintext
git-merge-one-file(1)
|
|
=====================
|
|
|
|
NAME
|
|
----
|
|
git-merge-one-file - The standard helper program to use with git-merge-index
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-merge-one-file'
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
This is the standard helper program to use with "git-merge-index"
|
|
to resolve a merge after the trivial merge done with "git-read-tree -m".
|
|
|
|
Author
|
|
------
|
|
Written by Linus Torvalds <torvalds@osdl.org>,
|
|
Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the gitlink:git[7] suite
|