user/sven/git.git/Documentation/core-tutorial.txt, branch v1.5.4.4

core-tutorial typofix

2008-01-18T06:55:25Z

Signed-off-by: Thomas Zander Signed-off-by: Junio C Hamano

Merge branch 'maint'

2007-11-14T11:37:18Z

* maint: git-clean: honor core.excludesfile Documentation: Fix man page breakage with DocBook XSL v1.72 git-remote.txt: fix typo core-tutorial.txt: Fix argument mistake in an example. replace reference to git-rm with git-reset in git-commit doc Grammar fixes for gitattributes documentation Don't allow fast-import tree delta chains to exceed maximum depth revert/cherry-pick: allow starting from dirty work tree. t/t3404: fix test for a bogus todo file. Conflicts: fast-import.c

core-tutorial.txt: Fix argument mistake in an example.

2007-11-14T09:59:12Z

One of examples has wrong output given the arguments provided. Fix arguments to match the output. Fix a minor syntax mistake in another place. Signed-off-by: Sergei Organov Signed-off-by: Junio C Hamano

Documentation: Fix references to deprecated commands

2007-11-12T08:18:44Z

... by changing git-tar-tree reference to git-archive and removing seemingly unrelevant footnote about git-ssh-{fetch,upload}. Signed-off-by: Jonas Fonseca Signed-off-by: Junio C Hamano

core-tutorial.txt: Fix git-show-branch example and its description

2007-11-10T10:01:12Z

Signed-off-by: Sergei Organov Signed-off-by: Junio C Hamano

Merge branch 'maint'

2007-11-02T23:56:42Z

* maint: Fixing path quoting in git-rebase Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites. Documentation: quote commit messages consistently. Remove escaping of '|' in manpage option sections

Documentation: quote commit messages consistently.

2007-11-02T22:38:24Z

Documentation quotes commit messages 14 times with double-quotes, and 7 times with single-quotes. The patch turns everything to double-quotes. A nice side effect is that documentation becomes more Windoze-friendly as AFAIK single quotes won't work there. Signed-off-by: Sergei Organov Signed-off-by: Junio C Hamano

Merge branch 'maint' into HEAD

2007-10-31T04:44:43Z

* maint: Update GIT 1.5.3.5 Release Notes git-rebase--interactive.sh: Make 3-way merge strategies work for -p. git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick. Fix --strategy parsing in git-rebase--interactive.sh Make merge-recursive honor diff.renamelimit cherry-pick/revert: more compact user direction message core-tutorial: Use new syntax for git-merge. git-merge: document but discourage the historical syntax Prevent send-pack from segfaulting (backport from 'master') Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example Conflicts: git-rebase--interactive.sh

core-tutorial: Use new syntax for git-merge.

2007-10-30T23:35:07Z

"git-merge HEAD " is still supported but we shouldn't encourage its use. Signed-off-by: Junio C Hamano

core-tutorial: Catch up with current Git

2007-10-29T18:39:42Z

No longer talk about Cogito since it's deprecated. Some scripts (such as git-reset or git-branch) have undergone builtinification so adjust the text to reflect this. Fix a typo in the description of git-show-branch (merges are indicated by a `-', not by a `.'). git-pull/git-push do not seem to use the dumb git-ssh-fetch/git-ssh-upload (the text was probably missing a word). Adjust a link that wasn't rendered properly because it was wrapped. Signed-off-by: Benoit Sigoure Signed-off-by: Junio C Hamano