git/Documentation, branch v1.2.2

Document --short and --git-dir in git-rev-parse(1)

2006-02-18T01:33:12Z

Signed-off-by: Jonas Fonseca

Documentation: git-ls-files asciidocco.

2006-02-14T05:52:10Z

Noticed by Jon Nelson. Signed-off-by: Junio C Hamano

Documentation: git-commit in 1.2.X series defaults to --include.

2006-02-13T08:32:10Z

The documentation was mistakenly describing the --only semantics to be default. The 1.2.0 release and its maintenance series 1.2.X will keep the traditional --include semantics as the default. Clarify the situation. Signed-off-by: Junio C Hamano

Add howto about separating topics.

2006-02-12T13:02:42Z

This howto consists of a footnote from an email by JC to the git mailing list (<7vfyms0x4p.fsf@assigned-by-dhcp.cox.net>). Signed-off-by: Kent Engstrom Signed-off-by: Junio C Hamano

Add support for explicit type specifiers when calling git-repo-config

2006-02-12T08:26:54Z

Currently, git-repo-config will just return the raw value of option as specified in the config file; this makes things difficult for scripts calling it, especially if the value is supposed to be boolean. This patch makes it possible to ask git-repo-config to check if the option is of the given type (int or bool) and write out the value in its canonical form. If you do not pass --int or --bool, the behaviour stays unchanged and the raw value is emitted. This also incidentally fixes the segfault when option with no value is encountered. [jc: tweaked the option parsing a bit to make it easier to see that the patch does not change anything but the type stuff in the diff output. Also changed to avoid "foo ? : bar" construct. ] Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano

Add --diff-filter= documentation paragraph

2006-02-09T20:06:57Z

Signed-off-by: Jon Loeliger Signed-off-by: Junio C Hamano

Basic documentation for git-show

2006-02-07T21:19:42Z

Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano

Document git-diff-tree --always

2006-02-07T21:19:40Z

Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano

format-patch: Remove last vestiges of --mbox option

2006-02-07T10:09:55Z

Don't mention it in docs or --help output. Remove mbox, date and author variables from git-format-patch.sh. Use DESCRIPTION text from man-page to update LONG_USAGE output. It's a bit silly to have two texts saying the same thing in different words, and I'm too lazy to update both. Signed-off-by: Andreas Ericsson Signed-off-by: Junio C Hamano

git-commit: revamp the git-commit semantics.

2006-02-07T07:20:32Z

- "git commit" without _any_ parameter keeps the traditional behaviour. It commits the current index. We commit the whole index even when this form is run from a subdirectory. - "git commit --include paths..." (or "git commit -i paths...") is equivalent to: git update-index --remove paths... git commit - "git commit paths..." acquires a new semantics. This is an incompatible change that needs user training, which I am still a bit reluctant to swallow, but enough people seem to have complained that it is confusing to them. It 1. refuses to run if $GIT_DIR/MERGE_HEAD exists, and reminds trained git users that the traditional semantics now needs -i flag. 2. refuses to run if named paths... are different in HEAD and the index (ditto about reminding). Added paths are OK. 3. reads HEAD commit into a temporary index file. 4. updates named paths... from the working tree in this temporary index. 5. does the same updates of the paths... from the working tree to the real index. 6. makes a commit using the temporary index that has the current HEAD as the parent, and updates the HEAD with this new commit. - "git commit --all" can run from a subdirectory, but it updates the index with all the modified files and does a whole tree commit. - In all cases, when the command decides not to create a new commit, the index is left as it was before the command is run. This means that the two "git diff" in the following sequence: $ git diff $ git commit -a $ git diff would show the same diff if you abort the commit process by making the commit log message empty. This commit also introduces much requested --author option. $ git commit --author 'A U Thor ' Signed-off-by: Junio C Hamano