git/Documentation, branch v2.7.3

Git 2.7.3

2016-03-10T19:14:08Z

Signed-off-by: Junio C Hamano

Merge branch 'mm/push-simple-doc' into maint

2016-03-10T19:13:44Z

The documentation did not clearly state that the 'simple' mode is now the default for "git push" when push.default configuration is not set. * mm/push-simple-doc: Documentation/git-push: document that 'simple' is the default

Merge branch 'jk/tighten-alloc' into maint

2016-03-10T19:13:43Z

* jk/tighten-alloc: (23 commits) compat/mingw: brown paper bag fix for 50a6c8e ewah: convert to REALLOC_ARRAY, etc convert ewah/bitmap code to use xmalloc diff_populate_gitlink: use a strbuf transport_anonymize_url: use xstrfmt git-compat-util: drop mempcpy compat code sequencer: simplify memory allocation of get_message test-path-utils: fix normalize_path_copy output buffer size fetch-pack: simplify add_sought_entry fast-import: simplify allocation in start_packfile write_untracked_extension: use FLEX_ALLOC helper prepare_{git,shell}_cmd: use argv_array use st_add and st_mult for allocation size computation convert trivial cases to FLEX_ARRAY macros use xmallocz to avoid size arithmetic convert trivial cases to ALLOC_ARRAY convert manual allocations to argv_array argv-array: add detach function add helpers for allocating flex-array structs harden REALLOC_ARRAY and xcalloc against size_t overflow ...

Documentation/git-push: document that 'simple' is the default

2016-02-23T21:35:10Z

The default behavior is well documented already in git-config(1), but git-push(1) itself did not mention it at all. For users willing to learn how "git push" works but not how to configure it, this makes the documentation cumbersome to read. Make the git-push(1) page self-contained by adding a short summary of what 'push.default=simple' does, early in the page. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

argv-array: add detach function

2016-02-22T22:50:32Z

The usual pattern for an argv array is to initialize it, push in some strings, and then clear it when done. Very occasionally, though, we must do other exotic things with the memory, like freeing the list but keeping the strings. Let's provide a detach function so that callers can make use of our API to build up the array, and then take ownership of it. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Git 2.7.2

2016-02-22T21:12:56Z

Signed-off-by: Junio C Hamano

Merge branch 'mm/clean-doc-fix' into maint

2016-02-22T21:10:20Z

The documentation for "git clean" has been corrected; it mentioned that .git/modules/* are removed by giving two "-f", which has never been the case. * mm/clean-doc-fix: Documentation/git-clean.txt: don't mention deletion of .git/modules/*

Start preparing for 2.7.2

2016-02-17T18:05:44Z

Signed-off-by: Junio C Hamano

Merge branch 'nd/do-not-move-worktree-manually' into maint

2016-02-17T18:03:40Z

"git worktree" had a broken code that attempted to auto-fix possible inconsistency that results from end-users moving a worktree to different places without telling Git (the original repository needs to maintain backpointers to its worktrees, but "mv" run by end-users who are not familiar with that fact will obviously not adjust them), which actually made things worse when triggered. * nd/do-not-move-worktree-manually: worktree: stop supporting moving worktrees manually worktree.c: fix indentation

Documentation/git-clean.txt: don't mention deletion of .git/modules/*

2016-02-09T18:07:34Z

The latter half of this sentence, the removal of the submodules, was never done with (or without) double -f back when it was written, and we still do not do so. Signed-off-by: Matt McCutchen Signed-off-by: Junio C Hamano