-
Notifications
You must be signed in to change notification settings - Fork 25.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactored merge options into separate merge-options.txt.
Refactored fetch options into separate fetch-options.txt. Made git-merge use merge-options. Made git-fetch use fetch-options. Made git-pull use merge-options and fetch-options. Added --help option to git-pull and git-format-patch scripts. Rewrote Documentation/Makefile to dynamically determine include dependencies. Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
- Loading branch information
Jon Loeliger
authored and
Junio C Hamano
committed
Nov 7, 2005
1 parent
9027907
commit 93d69d8
Showing
9 changed files
with
70 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
-a, \--append:: | ||
Append ref names and object names of fetched refs to the | ||
existing contents of `.git/FETCH_HEAD`. Without this | ||
option old data in `.git/FETCH_HEAD` will be overwritten. | ||
|
||
-f, \--force:: | ||
|
||
-t, \--tags:: | ||
|
||
-u, \--update-head-ok:: | ||
By default `git-fetch` refuses to update the head which | ||
corresponds to the current branch. This flag disables the | ||
check. Note that fetching into the current branch will not | ||
update the index and working directory, so use it with care. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
-n, \--no-summary:: | ||
Do not show diffstat at the end of the merge. | ||
|
||
--no-commit:: | ||
Perform the merge but pretend the merge failed and do | ||
not autocommit, to give the user a chance to inspect and | ||
further tweak the merge result before committing. | ||
|
||
|
||
-s <strategy>, \--strategy=<strategy>:: | ||
Use the given merge strategy; can be supplied more than | ||
once to specify them in the order they should be tried. | ||
If there is no `-s` option, a built-in list of strategies | ||
is used instead (`git-merge-resolve` when merging a single | ||
head, `git-merge-octopus` otherwise). | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters