delta/git.git, branch nd/commit-editor-cleanup

commit: add --cleanup=scissors

2014-02-25T17:35:20+00:00

Since 1a72cfd (commit -v: strip diffs and submodule shortlogs from the
commit message - 2013-12-05) we have a less fragile way to cut out
"git status" at the end of a commit message but it's only enabled for
stripping submodule shortlogs.

Add new cleanup option that reuses the same mechanism for the entire
"git status" without accidentally removing lines starting with '#'.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

wt-status.c: move cut-line print code out to wt_status_add_cut_line

2014-02-18T23:50:40+00:00

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

wt-status.c: make cut_line[] const to shrink .data section a bit

2014-02-18T23:50:36+00:00

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

Git 1.9.0

2014-02-14T19:35:04+00:00

Signed-off-by: Junio C Hamano

release notes: typo fixes

2014-02-14T19:22:56+00:00

Signed-off-by: Michael J Gruber 
Signed-off-by: Junio C Hamano

Sync with 1.8.5.5

2014-02-13T21:42:26+00:00

Signed-off-by: Junio C Hamano

Git 1.8.5.5

2014-02-13T21:41:53+00:00

Signed-off-by: Junio C Hamano

Merge branch 'bm/merge-base-octopus-dedup' into maint

2014-02-13T21:38:59+00:00

"git merge-base --octopus" used to leave cleaning up suboptimal
result to the caller, but now it does the clean-up itself.

* bm/merge-base-octopus-dedup:
  merge-base --octopus: reduce the result from get_octopus_merge_bases()
  merge-base: separate "--independent" codepath into its own helper

Merge branch 'jc/revision-range-unpeel' into maint

2014-02-13T21:38:47+00:00

"git log --left-right A...B" lost the "leftness" of commits
reachable from A when A is a tag as a side effect of a recent
bugfix.  This is a regression in 1.8.4.x series.

* jc/revision-range-unpeel:
  revision: propagate flag bits from tags to pointees
  revision: mark contents of an uninteresting tree uninteresting

Merge branch 'jk/allow-fetch-onelevel-refname' into maint

2014-02-13T21:38:34+00:00

"git clone" would fail to clone from a repository that has a ref
directly under "refs/", e.g. "refs/stash", because different
validation paths do different things on such a refname.  Loosen the
client side's validation to allow such a ref.

* jk/allow-fetch-onelevel-refname:
  fetch-pack: do not filter out one-level refs