Hi,
command output has changed for some commands in the last years,
so reflect this also in the user-manual. While doing so, fix some minor
spelling, formatting and wording issues.
Further, some references and recommendations which nowadays might
only confuse and not help new Git users where
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index fe723e4..103ec9a 100644
--- a/Documentation/user-manual.txt
+++
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 103ec9a..cb30929 100644
---
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index cb30929..b450980 100644
--- a/Documentation/user-manual.txt
git pull . works, but git merge is the recommended
way for new users to do things. (The old description
also should have read The former is actually *not* very
commonly used.)
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 15 ++-
1 file
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index ca78333..ccbddc7 100644
--- a/Documentation/user-manual.txt
+++
Combine the two cases for git add into one.
Add verb use to git rm case.
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/Documentation/user-manual.txt
Describe the conflict resolution in terms of the
commands the user is supposed to use.
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Documentation/user-manual.txt
Add some missing punctuation.
Simplify description of git branch -d/-D.
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 19 +++
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/Documentation/user-manual.txt
Remove unnecessary quoting.
Simplify description of three-way merge.
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Documentation/user-manual.txt
Sorry Jon, but this might not be of any help to new Git users ;)
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index
On Sat, Aug 24, 2013 at 11:07 AM, Duy Nguyen pclo...@gmail.com wrote:
On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer t.gumme...@gmail.com wrote:
Write the index version 5 file format to disk. This version doesn't
write the cache-tree data and resolve-undo data to the file.
I keep having
Hello,
I've tried to use the netrc credential with git-send-email
(v1.8.4-rc2), and I've had the following log (running with -d -v):
We were given search token protocol and value smtp
We were given search token host and value smtp.gmail.com:587
We were given search token username and value
Hello,
Due to a bug in the handling of submodules, here is a new release of
Tig. In addition to the bug fix, this new version reduces memory usage
and startup time of the main view and shows the blob size in the tree
view.
Note to packagers: the manual and manpage documentation files now live
From: Thomas Ackermann th.ac...@arcor.de
Hi,
command output has changed for some commands in the last years,
so reflect this also in the user-manual. While doing so, fix some
minor
spelling, formatting and wording issues.
Further, some references and recommendations which nowadays might
only
Hi,
Kacper Kornet wrote:
This is a set of fixes for problems found while running
test suite without perl installed.
I don't think git ever supported that. The PERL prerequisite
was to check for systems that did not have (a suitable) perl
at runtime, but perl is still pretty heavily used in
Kacper Kornet wrote:
In the test 'using invalid commit with -C' git-commit would have failed
even if the -C option had been given the correct commit, as there was
nothing to commit.
Good catch.
[...]
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -53,7 +53,10 @@ test_expect_success
Kacper Kornet wrote:
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -330,7 +330,7 @@ test_expect_success PERL 'split hunk add -p (edit)' '
! grep ^+15 actual
'
-test_expect_success 'patch mode ignores unmerged entries' '
+test_expect_success PERL 'patch mode
Kacper Kornet wrote:
Signed-off-by: Kacper Kornet drae...@pld-linux.org
Thanks.
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Here's a style cleanup on top.
-- 8 --
Subject: reset test: modernize style
Avoid command substitution and pipes to ensure that the exit status
from each git
When the pathspec given to grep includes a tree name, the full
name of matched files is assembled using colon as a separator.
If the pathspec includes a tree name, it should use a slash
instead.
Check if the pathspec already names a tree and ref (including
a colon) and use a slash if so.
---
I'm
On Sat, Aug 24, 2013 at 9:35 PM, Phil Hord ho...@cisco.com wrote:
When the pathspec given to grep includes a tree name, the full
name of matched files is assembled using colon as a separator.
If the pathspec includes a tree name, it should use a slash
instead.
Check if the pathspec already
p...@padd.com wrote on Thu, 15 Aug 2013 21:24 -0400:
ksaitoh...@gmail.com wrote on Wed, 14 Aug 2013 09:59 +0900:
My only concern is in the commit message, about performance. A
change that has lots of files in it will cause many roundtrips to
p4d to do p4 where on each. When the files
Thomas Ackermann wrote:
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1,6 +1,5 @@
-Git User's Manual (for version 1.5.3 or newer)
+Git User Manual
User versus User's: why? But I don't care much about this.
Dropping the reference to 1.5.3 is very welcome,
Duy Nguyen pclo...@gmail.com writes:
On Mon, Aug 19, 2013 at 2:41 AM, Thomas Gummerer t.gumme...@gmail.com wrote:
I'm done reviewing this version (I neglected the extension writing
patches because after spending hours on the main write patch I don't
want to look at them anymore :p). Now that
Thomas Ackermann th.ac...@arcor.de writes:
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index fe723e4..103ec9a
Thomas Ackermann th.ac...@arcor.de writes:
git pull . works, but git merge is the recommended
way for new users to do things. (The old description
also should have read The former is actually *not* very
commonly used.)
I think it is probably a good idea to replace pull . in the two
later
Thomas Ackermann th.ac...@arcor.de writes:
Combine the two cases for git add into one.
Add verb use to git rm case.
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git
Thomas Ackermann th.ac...@arcor.de writes:
Describe the conflict resolution in terms of the
commands the user is supposed to use.
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git
Thomas Ackermann th.ac...@arcor.de writes:
Add some missing punctuation.
Simplify description of git branch -d/-D.
...
`git branch -d branch`::
- delete the branch `branch`; if the branch you are deleting
- points to a commit which is not reachable from the current
- branch,
Thomas Ackermann th.ac...@arcor.de writes:
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index f713f26..aa6bfab 100644
---
Phil Hord phil.h...@gmail.com writes:
On Sat, Aug 24, 2013 at 9:35 PM, Phil Hord ho...@cisco.com wrote:
When the pathspec given to grep includes a tree name, the full
name of matched files is assembled using colon as a separator.
If the pathspec includes a tree name, it should use a slash
Thomas Ackermann wrote:
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -312,10 +312,17 @@ referenced by a tag:
$ git checkout v2.6.17
- Note: moving to v2.6.17 which isn't a local branch
-
Matthieu Moy matthieu@grenoble-inp.fr writes:
How would I do that? The update to the remote namespace is done by Git,
not by the remote-helper.
OK, I'm now convinced that my solution is the right one. The
alternatives are far more complex and I still fail to see the benefits.
Sounds
Thomas Ackermann th.ac...@arcor.de writes:
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/user-manual.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index aa6bfab..0d3f04e 100644
---
Thomas Ackermann th.ac...@arcor.de writes:
Sorry Jon, but this might not be of any help to new Git users ;)
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
Yeah, I think this is long overdue. The drawing was taken from an
e-mail posted in a discussion, and the credit should have been given
Thomas Ackermann th.ac...@arcor.de writes:
According to the man-pages of git prune and git fsck,
both are safe nowadays.
Safe does not have much to do with the latter. git fsck has
always been safe in that it would not alter the object store, and if
you run it while you are actively creating
On Sat, Aug 24, 2013 at 04:07:47PM +0200, Antoine Pelisse wrote:
@@ -945,13 +947,16 @@ static const char *find_author_by_nickname(const char
*name)
av[++ac] = buf.buf;
av[++ac] = NULL;
setup_revisions(ac, av, revs, NULL);
+ revs.mailmap = mailmap;
+
Thomas Ackermann wrote:
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -3203,14 +3203,11 @@ To put the loose objects into a pack, just run git
repack:
$ git repack
[...]
-Total 6020, written 6020 (delta
Thomas Ackermann wrote:
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1784,17 +1784,6 @@ repository that you pulled from.
fast-forwards,fast-forward; instead, your branch will just be
updated to point to the latest commit from the upstream branch.)
-The
Junio C Hamano wrote:
Phil Hord phil.h...@gmail.com writes:
On Sat, Aug 24, 2013 at 9:35 PM, Phil Hord ho...@cisco.com wrote:
When the pathspec given to grep includes a tree name, the full
name of matched files is assembled using colon as a separator.
If the pathspec includes a tree name, it
On Sun, Aug 25, 2013 at 10:07 AM, Junio C Hamano gits...@pobox.com wrote:
Duy Nguyen pclo...@gmail.com writes:
On Mon, Aug 19, 2013 at 2:41 AM, Thomas Gummerer t.gumme...@gmail.com
wrote:
I'm done reviewing this version (I neglected the extension writing
patches because after spending
On Sat, Aug 24, 2013 at 09:35:58PM -0400, Phil Hord wrote:
When the pathspec given to grep includes a tree name, the full
name of matched files is assembled using colon as a separator.
If the pathspec includes a tree name, it should use a slash
instead.
Check if the pathspec already names
Thomas Ackermann wrote:
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -219,7 +219,7 @@ of development leading to that point.
The best way to see how this works is using the linkgit:gitk[1]
command; running gitk now on a Git repository and looking for merge
Thomas Ackermann wrote:
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1080,19 +1080,14 @@ produce no output at that point.
Modifying the index is easy:
-To update the index with the new contents of a modified file, use
+To add the contents of a new file
Thomas Ackermann wrote:
Describe the conflict resolution in terms of the
commands the user is supposed to use.
[...]
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1251,10 +1251,8 @@ Automatic merge failed; fix conflicts and then commit
the result.
Jeff King p...@peff.net writes:
On Sat, Aug 24, 2013 at 04:07:47PM +0200, Antoine Pelisse wrote:
@@ -945,13 +947,16 @@ static const char *find_author_by_nickname(const char
*name)
av[++ac] = buf.buf;
av[++ac] = NULL;
setup_revisions(ac, av, revs, NULL);
+revs.mailmap =
Thomas Ackermann wrote:
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -3992,16 +3992,16 @@ Merging multiple trees
Git helps you do a three-way merge, which you can expand to n-way by
repeating the merge procedure arbitrary times until you finally
-commit
Thomas Ackermann wrote:
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2131,8 +2131,6 @@ He uses two public branches:
- A test tree into which patches are initially placed so that they
can get some exposure when integrated with other ongoing development.
Jonathan Nieder jrnie...@gmail.com writes:
I think Phil meant that when git grep is asked to search within
HEAD:some/path, filenames tacked on at the end should be appended
with a '/' separator instead of the usual ':' (e.g.,
HEAD:some/path/inner/path.c, not HEAD:some/path:inner/path.c).
Ah,
On Sat, Aug 24, 2013 at 9:19 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Thomas Ackermann wrote:
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1784,17 +1784,6 @@ repository that you pulled from.
fast-forwards,fast-forward; instead, your branch will just be
Jeff King wrote:
So we are necessarily reconstructing based on what we know of the
syntax. And I think that your rule is OK, because we know that refnames
cannot contain a colon.
What happens with expressions like HEAD^{/test:}?
Jonathan
--
To unsubscribe from this list: send the line
On Sat, Aug 24, 2013 at 10:41:42PM -0700, Jonathan Nieder wrote:
Jeff King wrote:
So we are necessarily reconstructing based on what we know of the
syntax. And I think that your rule is OK, because we know that refnames
cannot contain a colon.
What happens with expressions like
Hi,
Eric Sunshine wrote:
The short SHA-1 collision test requires carefully crafted commits in
order to ensure a collision at rebase time.
Yeah, this breaks the usual rule that tests should be independent
of hashing function. But it's the best we can do, I think.
[...]
---
Matthieu Moy wrote:
In most cases, feature foo does not just require that the feature
exists, but also changes the behavior to enable it.
For what it's worth,
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a
54 matches
Mail list logo
