mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'maint-1.6.1' into maint-1.6.2
* maint-1.6.1: git-show-ref.txt: remove word and make consistent git-svn documentation: fix typo in 'rebase vs. pull/merge' section use xstrdup, not strdup in ll-merge.c
This commit is contained in:
commit
cd12f53612
|
@ -24,7 +24,7 @@ The --exclude-existing form is a filter that does the inverse, it shows the
|
|||
refs from stdin that don't exist in the local repository.
|
||||
|
||||
Use of this utility is encouraged in favor of directly accessing files under
|
||||
in the `.git` directory.
|
||||
the `.git` directory.
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
|
@ -50,7 +50,7 @@ OPTIONS
|
|||
-s::
|
||||
--hash::
|
||||
|
||||
Only show the SHA1 hash, not the reference name. When also using
|
||||
Only show the SHA1 hash, not the reference name. When combined with
|
||||
--dereference the dereferenced tag will still be shown after the SHA1.
|
||||
|
||||
--verify::
|
||||
|
|
|
@ -599,7 +599,7 @@ pulled or merged from. This is because the author favored
|
|||
If you use `git svn set-tree A..B` to commit several diffs and you do
|
||||
not have the latest remotes/git-svn merged into my-branch, you should
|
||||
use `git svn rebase` to update your work branch instead of `git pull` or
|
||||
`git merge`. `pull`/`merge' can cause non-linear history to be flattened
|
||||
`git merge`. `pull`/`merge` can cause non-linear history to be flattened
|
||||
when committing into SVN, which can lead to merge commits reversing
|
||||
previous commits in SVN.
|
||||
|
||||
|
|
|
@ -238,7 +238,7 @@ static int read_merge_config(const char *var, const char *value, void *cb)
|
|||
|
||||
if (!strcmp(var, "merge.default")) {
|
||||
if (value)
|
||||
default_ll_merge = strdup(value);
|
||||
default_ll_merge = xstrdup(value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -272,7 +272,7 @@ static int read_merge_config(const char *var, const char *value, void *cb)
|
|||
if (!strcmp("name", ep)) {
|
||||
if (!value)
|
||||
return error("%s: lacks value", var);
|
||||
fn->description = strdup(value);
|
||||
fn->description = xstrdup(value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -295,14 +295,14 @@ static int read_merge_config(const char *var, const char *value, void *cb)
|
|||
* file named by %A, and signal that it has done with zero exit
|
||||
* status.
|
||||
*/
|
||||
fn->cmdline = strdup(value);
|
||||
fn->cmdline = xstrdup(value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!strcmp("recursive", ep)) {
|
||||
if (!value)
|
||||
return error("%s: lacks value", var);
|
||||
fn->recursive = strdup(value);
|
||||
fn->recursive = xstrdup(value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue