Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de> --- git-am.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-am.sh b/git-am.sh index 5f0f241..2ecebc4 100755 --- a/git-am.sh +++ b/git-am.sh @@ -14,7 +14,7 @@ b,binary pass --allo-binary-replacement to git-apply 3,3way allow fall back on 3way merging if needed s,signoff add a Signed-off-by line to the commit message u,utf8 recode into utf8 (default) -k,keep pass -k f...

Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de> --- Documentation/git-push.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 5f24944..18e0c06 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -53,7 +53,7 @@ side are updated. + `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`. + -A parameter <ref> without a colon pushes the <ref&...

Now I think this patch (except the part about "stty echo") makes sense, although I did not try killing a send-email session with signals myself. Success stories, people? -

* Sat 2008-02-02 J. Bruce Fields <bfields@fieldses.org> Yeah let's continue as usual. And every time you need to explain the difference, when you could just teach one. The is no doubt that HEAD~N is superior to HEAD^^^^^^^^^^^^^^^^^^^^^^^ Count that. Optimizing keystrokes is hardly ever a brilliant idea from learning perspective. Jari -- Welcome to FOSS revolution: we fix and modify until it shines -

* Sat 2008-02-02 Jakub Narebski <jnareb@gmail.com> I'm afreaid that "optiomization" is seen a virtua in the manual pages. I certainly do not wish to use "shorter", if it would mean "less readable" It's certianly true that the cognitive burder to see foreign construct is higer than, when you can associate a thing to familiar one. Here, he familiarity from other CVSs is term HEAD or TIP, which follows that HEAD~1 in context of other similar ones (HEAD~2, HEAD~2 ...) is self evident...

I do remember at one point the man pages looking correctly (just tested v1.5.3.8 and it shows the same problem). Therefore it is probably some package I'm missing on my system. And now, I see this scattered all over: For example: .ft C $ git checkout master \fB(1)\fR $ git checkout master~2 Makefile \fB(2)\fR $ rm -f hello.c $ git checkout hello.c \fB(3)\fR .ft Seems that "------------" and <n>, and a few others aren't bein...

Yes, I'm seeing this on mac as well. -geert -

Here is the current version of the safecrlf patch. It applies to the post 1.5.4 master and has the following changes since v5: - Uses git config instead of git repo-config. - The tests use test_expect_success. Steffen ---- snip --- CRLF conversion bears a slight chance of corrupting data. autocrlf=true will convert CRLF to LF during commit and LF to CRLF during checkout. A file that contains a mixture of LF and CRLF before the commit cannot be recreated by git. For text files this d...

No, I would not. The fact that the parameter _requires substitution_ (is placeholder) is orthogonal (independent) of the fact if the parameter is required or optional. Angle brackets (and italic or underline) means "placeholder", while lack of angle brackets (and bold) means "literal". Square brackets means "optional", while lack I would say that in command option the 'option' string is literal, while in command <option> you have to substitute actual option in the p...

* Sat 2008-02-02 Mike Hommey <mh@glandium.org> gmane.comp.version-control.git I use HEAD~1 always, because I think the consistency in learning the most important factor. It does not matter what advanced users use. The documentation should primarily focus the newcomers. The first question a newbie asks, if manual pages mixes syntaxes: What the heck "^" ?. I just saw HEAD~N, is the other one somehow special? All the other examples refer to HEAD~N Those used to git may...

I think that focusing on the fact that "HEAD^1" is peel-like operator, selecting first parent of HEAD, That "HEAD^" is a shortcut for that, and that "HEAD~3" is a shortcut for "HEAD^^^" similarly to how "3 * 2" is a shortcut for "2 + 2 + 2" is better solution. "HEAD~1" and The documentation should cater to both advanced users and newcomers, unless it is specifically targeted towards newcomers like different IMHO the sequence: "HEAD^1" -> "HEAD^", "HEAD^1^1^1" -> "HEAD^^^" ->...

Only in two places is possible to really simplify deflate code with the all_in_one decompress_all() Signed-off-by: Marco Costalba <mcostalba@gmail.com> --- builtin-apply.c | 23 +++++++++-------------- index-pack.c | 30 +++++++----------------------- 2 files changed, 16 insertions(+), 37 deletions(-) diff --git a/builtin-apply.c b/builtin-apply.c index 30d86f2..fa589e6 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -8,6 +8,7 @@ */ #include "cache.h" #include "cach...

In this case decompression helper conversion is quite similar and not too complex, so they go togheter. Also in index-pack.c pass correct arguments to decompress_next_from(). Signed-off-by: Marco Costalba <mcostalba@gmail.com> --- builtin-pack-objects.c | 14 ++++++-------- builtin-unpack-objects.c | 22 +++++++++------------- index-pack.c | 4 +++- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c in...

When decompressing a zlib stream use this helpers instead of calling low level zlib function. This patch introduces the necessary framework, still no code change. This is the first step in generalizing compress and decompress functions avoiding zlib directly calls. Signed-off-by: Marco Costalba <mcostalba@gmail.com> --- Makefile | 4 ++-- compress.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ compress.h | 12 ++++++++++++ 3 files changed, 72 insertions(...

Here is slightly more difficult, in particular a xrealloc() has been substituted with a free() + xmalloc() to keep the code simple. Signed-off-by: Marco Costalba <mcostalba@gmail.com> --- fast-import.c | 45 +++++++++++++++------------------------------ 1 files changed, 15 insertions(+), 30 deletions(-) diff --git a/fast-import.c b/fast-import.c index a523b17..b6bb84c 100644 --- a/fast-import.c +++ b/fast-import.c @@ -141,6 +141,7 @@ Format of STDIN stream: #include "builtin.h" ...

A multistep compress is required here, so we need the full arsenal of compress helpers. Signed-off-by: Marco Costalba <mcostalba@gmail.com> --- sha1_file.c | 41 ++++++++++++----------------------------- 1 files changed, 12 insertions(+), 29 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 66a4e00..f48ad04 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -7,6 +7,7 @@ * creation etc. */ #include "cache.h" +#include "compress.h" #include "delta.h" #include "pack.h" ...

Decompressing turns out to be more difficult then comrpessing. Helpers are more because more are the way zlib deflate() is used in git. This patch just introduces the helpers, still no code change. Signed-off-by: Marco Costalba <mcostalba@gmail.com> --- compress.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ compress.h | 17 ++++++++++++- 2 files changed, 97 insertions(+), 1 deletions(-) diff --git a/compress.c b/compress.c index 0d0b9d9..cf9d5ca 100644 ...

Hi, I don't believe it. "git branch" would have shown "* (no branch)" as current branch, unless the rebase is finalized. git rebase -i works on a _detached_ HEAD, for two reasons: - easier working with reflogs (as the branch's reflog shows before rebase and after rebase, but nothing in between), and - to prevent exactly the scenario you are describing. Ciao, Dscho -

Hi, rebase -i uses a detached HEAD since it was merged. In 1.5.4, rebase (note the absence of -i) uses a detached HEAD, too. Ciao, Dscho -

This is necessary to allow match_fragment() to attempt a match with a preimage that is based on a version before whitespace errors were fixed. Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin-apply.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/builtin-apply.c b/builtin-apply.c index 2af625a..5f3c047 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1614,6 +1614,7 @@ static int match_fragment(struct image *img, struct image *po...

This new error mode allows a line to have a carriage return at the end of the line when checking and fixing trailing whitespace errors. Some people like to keep CRLF line ending recorded in the repository, and still want to take advantage of the automated trailing whitespace stripping. We still show ^M in the diff output piped to "less" to remind them that they do have the CR at the end, but these carriage return characters at the end are no longer flagged as errors. Signed-off-by: Junio C Haman...

The "patch" parameter used to include leading '+' of an added line in the patch, and the array was treated as 1-based. Make it accept the contents of the line alone and simplify the code. Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin-apply.c | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/builtin-apply.c b/builtin-apply.c index d0d008f..0bc33bd 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1646,16 ...

Wnen the caller knows the hunk needs to match at the beginning or at the end, there is no point starting from the line number that is found in the patch and trying match with increasing offset. The logic to find matching lines was made more line oriented with the previous patch and this optimization is now trivial. Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin-apply.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/builtin-apply.c b/bui...

We had two pointer variables pointing to the same buffer and an integer variable used to index into its tail part that was active (old, oldlines and oldsize for the preimage, and their 'new' counterparts for the postimage). To help readability, use 'oldlines' as the allocated pointer, and use 'old' as the pointer to the tail that advances while the code builds up the contents in the buffer. The size 'oldsize' can be computed as (old-oldines). Signed-off-by: Junio C Hamano <gitster@pobox.com&...

This moves three "if" conditions out of line from find_offset() function, which is responsible for finding the matching place in the preimage to apply the patch. There is no change in the logic of the program. Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin-apply.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/builtin-apply.c b/builtin-apply.c index 15432b6..2c052f8 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1437,6...