From 41e4d69fb82cd92bbc39accc9cb2be49b7597b5c Mon Sep 17 00:00:00 2001 From: Nazri Ramliy Date: Wed, 2 Jun 2010 01:54:46 +0800 Subject: Documentation/pretty-{formats,options}: better reference for "format:" In "git help log" (and friends) it's not easy to find the possible placeholder for for the "--pretty=format:" option to git log. This patch makes the placeholder easier to find by adding a reference to the "PRETTY FORMATS" section and repeating the "format:" phrase. Signed-off-by: Nazri Ramliy Signed-off-by: Junio C Hamano diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 1686a54..c85a52c 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -76,9 +76,9 @@ displayed in full, regardless of whether --abbrev or true parent commits, without taking grafts nor history simplification into account. -* 'format:' +* 'format:' + -The 'format:' format allows you to specify which information +The 'format:' format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with '%n' instead of '\n'. diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index af6d2b9..d78e121 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -3,8 +3,9 @@ Pretty-print the contents of the commit logs in a given format, where '' can be one of 'oneline', 'short', 'medium', - 'full', 'fuller', 'email', 'raw' and 'format:'. - When omitted, the format defaults to 'medium'. + 'full', 'fuller', 'email', 'raw' and 'format:'. See + the "PRETTY FORMATS" section for some additional details for each + format. When omitted, the format defaults to 'medium'. + Note: you can specify the default pretty format in the repository configuration (see linkgit:git-config[1]). -- cgit v0.10.2-6-g49f6 From 873c3472052e3d0385be4ece7b70cfdf573c051e Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 1 Jun 2010 17:16:42 +0200 Subject: Documentation: A...B shortcut for checkout and rebase Describe the A...B shortcuts for checkout and rebase [-i] which were introduced in these commits: 619a64e ("checkout A...B" switches to the merge base between A and B, 2009-10-18) 61dfa1b ("rebase --onto A...B" replays history on the merge base between A and B, 2009-11-20) 230a456 (rebase -i: teach --onto A...B syntax, 2010-01-07) Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 37c1810..a3a87fa 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -136,6 +136,10 @@ edits from your current working tree. As a special case, the `"@\{-N\}"` syntax for the N-th last branch checks out the branch (instead of detaching). You may also specify `-` which is synonymous with `"@\{-1\}"`. ++ +As a further special case, you may use `"A...B"` as a shortcut for the +merge base of `A` and `B` if there is exactly one merge base. You can +leave out at most one of `A` and `B`, in which case it defaults to `HEAD`. :: Name for the new branch. diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 5863dec..50ba2e4 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -206,6 +206,10 @@ OPTIONS --onto option is not specified, the starting point is . May be any valid commit, and not just an existing branch name. ++ +As a special case, you may use "A...B" as a shortcut for the +merge base of A and B if there is exactly one merge base. You can +leave out at most one of A and B, in which case it defaults to HEAD. :: Upstream branch to compare against. May be any valid commit, -- cgit v0.10.2-6-g49f6 From 761a889a97a33d277f8a6607a4696164391f9d5d Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Tue, 1 Jun 2010 20:55:36 -0500 Subject: git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX IRIX 6.5.26m does not define the 'sgi' macro, but it does define an '__sgi' macro. Since later IRIX versions (6.5.29m) define both macros, and since an underscore prefixed macro is preferred anyway, use '__sgi' to detect compilation on SGI IRIX. Signed-off-by: Brandon Casey Signed-off-by: Gary V. Vaughan Signed-off-by: Junio C Hamano diff --git a/git-compat-util.h b/git-compat-util.h index 7e62b55..b96912b 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -56,7 +56,7 @@ # define _XOPEN_SOURCE 500 # endif #elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && \ - !defined(_M_UNIX) && !defined(sgi) && !defined(__DragonFly__) + !defined(_M_UNIX) && !defined(__sgi) && !defined(__DragonFly__) #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */ #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */ #endif -- cgit v0.10.2-6-g49f6