delta/git.git/Documentation, branch nd/pretty-commit-log-message

Git 1.7.4

2011-01-31T03:02:37+00:00

Signed-off-by: Junio C Hamano

Git 1.7.4-rc3

2011-01-24T19:00:00+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jn/setup-fixes'

2011-01-24T18:53:09+00:00

* jn/setup-fixes:
  t1510: fix typo in the comment of a test
  Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase
  Subject: setup: officially support --work-tree without --git-dir
  tests: compress the setup tests
  tests: cosmetic improvements to the repo-setup test
  t/README: hint about using $(pwd) rather than $PWD in tests
  Fix expected values of setup tests on Windows

Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase

2011-01-24T18:13:59+00:00

Signed-off-by: Junio C Hamano

Documentation: do not treat reset --keep as a special case

2011-01-21T20:41:14+00:00

The current treatment of "git reset --keep" emphasizes how it
differs from --hard (treatment of local changes) and how it breaks
down into plumbing (git read-tree -m -u HEAD  followed by git
update-ref HEAD ).  This can discourage people from using
it, since it might seem to be a complex or niche option.

Better to emphasize what the --keep flag is intended for --- moving
the index and worktree from one commit to another, like "git checkout"
would --- so the reader can make a more informed decision about the
appropriate situations in which to use it.

Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Documentation/fast-import: put explanation of M 040000 "" in context

2011-01-19T00:51:13+00:00

Omit needless words ("Additionally ...  may also" is redundant).
While at it, place the explanation of this special case after the
general rules for paths to provide the reader with some context.

Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Documentation/fast-import: capitalize beginning of sentence

2011-01-18T18:15:59+00:00

Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Git 1.7.4-rc2

2011-01-13T20:14:18+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jn/perl-funcname'

2011-01-13T19:38:05+00:00

* jn/perl-funcname:
  userdiff/perl: catch BEGIN/END/... and POD as headers
  diff: funcname and word patterns for perl

Merge branch 'jk/diff-driver-binary-doc'

2011-01-13T19:34:56+00:00

* jk/diff-driver-binary-doc:
  docs: explain diff.*.binary option