Skip to content

Commit

Permalink
Merge branch 'maint-1.6.2' into maint
Browse files Browse the repository at this point in the history
* maint-1.6.2:
  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
  • Loading branch information
gitster committed Jun 21, 2009
2 parents ef52aaf + cd12f53 commit 3ba4f3a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Documentation/git-show-ref.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------
Expand All @@ -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::
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-svn.txt
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,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.

Expand Down
8 changes: 4 additions & 4 deletions ll-merge.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down

0 comments on commit 3ba4f3a

Please sign in to comment.