summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-21 06:48:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-21 06:48:21 (GMT)
commit4258c212ca2c3674be4b7e00a19db705eee77a48 (patch)
tree93e421911fc6e07f3dd18ea83aab9bd4ce2dd26e
parentdfe50511c7e5ec2bc771c9a5f4c3318332a7744e (diff)
parentd4900ee48c70114ea3227f922d383de6b273fcde (diff)
downloadgit-4258c212ca2c3674be4b7e00a19db705eee77a48.zip
git-4258c212ca2c3674be4b7e00a19db705eee77a48.tar.gz
git-4258c212ca2c3674be4b7e00a19db705eee77a48.tar.bz2
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: 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
-rw-r--r--Documentation/git-show-ref.txt4
-rw-r--r--Documentation/git-svn.txt2
-rw-r--r--ll-merge.c8
3 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt
index 2f173ff..98e294a 100644
--- a/Documentation/git-show-ref.txt
+++ b/Documentation/git-show-ref.txt
@@ -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::
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 8d0c421..216c456 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -563,7 +563,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.
diff --git a/ll-merge.c b/ll-merge.c
index fa2ca52..9723f3a 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -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;
}