Junio C Hamano dc5400e11d Merge branch 'jc/rerere' ...

Code clean-up and minor fixes.

* jc/rerere: (21 commits)
  rerere: un-nest merge() further
  rerere: use "struct rerere_id" instead of "char *" for conflict ID
  rerere: call conflict-ids IDs
  rerere: further clarify do_rerere_one_path()
  rerere: further de-dent do_plain_rerere()
  rerere: refactor "replay" part of do_plain_rerere()
  rerere: explain the remainder
  rerere: explain "rerere forget" codepath
  rerere: explain the primary codepath
  rerere: explain MERGE_RR management helpers
  rerere: fix benign off-by-one non-bug and clarify code
  rerere: explain the rerere I/O abstraction
  rerere: do not leak mmfile[] for a path with multiple stage #1 entries
  rerere: stop looping unnecessarily
  rerere: drop want_sp parameter from is_cmarker()
  rerere: report autoupdated paths only after actually updating them
  rerere: write out each record of MERGE_RR in one go
  rerere: lift PATH_MAX limitation
  rerere: plug conflict ID leaks
  rerere: handle conflicts with multiple stage #1 entries
  ...

2015-10-05 12:30:05 -07:00

..

add.c

Merge branch 'sb/remove-unused-var-from-builtin-add' into maint

2015-08-19 14:41:33 -07:00

am.c

Merge branch 'jc/builtin-am-signoff-regression-fix'

2015-09-08 15:35:05 -07:00

annotate.c

…

apply.c

Merge branch 'gb/apply-comment-typofix'

2015-09-14 11:44:44 -07:00

archive.c

…

bisect--helper.c

…

blame.c

memoize common git-path "constant" files

2015-08-10 15:37:14 -07:00

branch.c

Merge branch 'kn/for-each-tag-branch'

2015-10-05 12:30:03 -07:00

bundle.c

…

cat-file.c

cat-file: sort and de-dup output of --batch-all-objects

2015-06-26 09:24:42 -07:00

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'jc/calloc-pathspec' into maint

2015-09-03 19:18:00 -07:00

clean.c

Merge branch 'rs/janitorial' into maint

2015-06-16 14:33:47 -07:00

clone.c

Merge branch 'jk/guess-repo-name-regression-fix' into maint

2015-08-25 16:09:17 -07:00

column.c

…

commit-tree.c

…

commit.c

Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update'

2015-09-01 16:31:29 -07:00

config.c

get_urlmatch: avoid useless strbuf write

2015-08-20 13:16:50 -07:00

count-objects.c

…

credential.c

…

describe.c

Merge branch 'sg/describe-contains'

2015-08-31 15:39:10 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

…

fast-export.c

refs: move the remaining ref module declarations to refs.h

2015-06-22 13:17:12 -07:00

fetch-pack.c

…

fetch.c

Merge branch 'mh/get-remote-group-fix' into maint

2015-09-03 19:17:48 -07:00

fmt-merge-msg.c

refs: move the remaining ref module declarations to refs.h

2015-06-22 13:17:12 -07:00

for-each-ref.c

Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint

2015-08-03 10:41:31 -07:00

fsck.c

prefer git_pathdup to git_path in some possibly-dangerous cases

2015-08-10 15:37:12 -07:00

gc.c

Merge branch 'mh/tempfile'

2015-08-25 14:57:09 -07:00

get-tar-commit-id.c

…

grep.c

…

hash-object.c

Merge branch 'jc/hash-object' into maint

2015-05-26 13:49:25 -07:00

help.c

…

index-pack.c

Merge branch 'jc/finalize-temp-file'

2015-08-19 14:48:55 -07:00

init-db.c

write_file(): drop caller-supplied LF from calls to create a one-liner file

2015-08-25 12:49:19 -07:00

interpret-trailers.c

…

log.c

builtin/log.c: minor reformat

2015-08-25 13:11:21 -07:00

ls-files.c

ps_matched: xcalloc() takes nmemb and then element size

2015-08-20 09:57:38 -07:00

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

memoize common git-path "constant" files

2015-08-10 15:37:14 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

Merge branch 'jk/notes-merge-config'

2015-08-31 15:39:05 -07:00

pack-objects.c

Merge branch 'ah/pack-objects-usage-strings'

2015-09-01 16:31:12 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

Merge branch 'nd/multiple-work-trees'

2015-07-13 14:02:02 -07:00

pull.c

pull: don't mark values for option "rebase" for translation

2015-09-11 09:50:00 -07:00

push.c

push: add a config option push.gpgSign for default signed pushes

2015-08-19 12:58:58 -07:00

read-tree.c

Merge branch 'ah/read-tree-usage-string'

2015-09-01 16:31:16 -07:00

receive-pack.c

Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maint

2015-08-19 14:41:26 -07:00

reflog.c

Merge branch 'ah/reflog-typofix-in-error'

2015-09-01 16:31:18 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

remote.c: drop extraneous local variable from migrate_file

2015-08-10 15:37:12 -07:00

repack.c

prefer mkpathdup to mkpath in assignments

2015-08-10 15:37:12 -07:00

replace.c

Merge branch 'mh/replace-refs'

2015-08-03 11:01:10 -07:00

rerere.c

Merge branch 'jc/rerere'

2015-10-05 12:30:05 -07:00

reset.c

memoize common git-path "constant" files

2015-08-10 15:37:14 -07:00

rev-list.c

rev-list: make it obvious that we do not support notes

2015-08-24 10:33:15 -07:00

rev-parse.c

rev-parse --parseopt: allow [*=?!] in argument hints

2015-07-15 10:30:54 -07:00

revert.c

…

rm.c

…

send-pack.c

push: add a config option push.gpgSign for default signed pushes

2015-08-19 12:58:58 -07:00

shortlog.c

convert "enum date_mode" into a struct

2015-06-29 11:39:07 -07:00

show-branch.c

Sync with 2.5.2

2015-09-09 14:30:35 -07:00

show-ref.c

show-ref: place angle brackets around variables in usage string

2015-08-31 09:33:53 -07:00

stripspace.c

…

symbolic-ref.c

…

tag.c

Merge branch 'kn/for-each-tag-branch'

2015-10-05 12:30:03 -07:00

unpack-file.c

…

unpack-objects.c

fsck (receive-pack): allow demoting errors to warnings

2015-06-23 14:27:34 -07:00

update-index.c

Merge branch 'nd/untracked-cache'

2015-05-26 13:24:46 -07:00

update-ref.c

tag, update-ref: improve description of option "create-reflog"

2015-09-11 09:50:02 -07:00

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-commit.c

verify-commit: add option to print raw gpg status information

2015-06-22 14:20:47 -07:00

verify-pack.c

…

verify-tag.c

verify-tag: add option to print raw gpg status information

2015-06-22 14:20:47 -07:00

worktree.c

Merge branch 'jc/am-state-fix'

2015-08-31 15:39:03 -07:00

write-tree.c

…