Junio C Hamano ada8710e63 Merge branch 'fc/rerere-conflict-style' into maint ...

"git rerere forget" did not work well when merge.conflictstyle
was set to a non-default value.

* fc/rerere-conflict-style:
  rerere: fix for merge.conflictstyle

2014-06-25 11:48:54 -07:00

..

add.c

Merge branch 'fr/add-interactive-argv-array'

2014-03-28 13:51:05 -07:00

annotate.c

…

apply.c

Merge branch 'jc/apply-ignore-whitespace' into maint

2014-06-25 11:46:23 -07:00

archive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

bisect--helper.c

Replace deprecated OPT_BOOLEAN by OPT_BOOL

2013-08-05 11:32:19 -07:00

blame.c

Merge branch 'bc/blame-crlf-test' into maint

2014-06-25 11:46:45 -07:00

branch.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

bundle.c

…

cat-file.c

Merge branch 'jk/warn-on-object-refname-ambiguity'

2014-03-25 11:07:36 -07:00

check-attr.c

Merge branch 'jc/check-attr-honor-working-tree' into maint

2014-03-18 14:03:03 -07:00

check-ignore.c

Merge branch 'dw/check-ignore-sans-index'

2013-09-20 12:37:32 -07:00

check-mailmap.c

builtin: add git-check-mailmap command

2013-07-13 10:19:37 -07:00

check-ref-format.c

…

checkout-index.c

Merge branch 'nd/lift-path-max'

2013-10-30 12:10:56 -07:00

checkout.c

Merge branch 'jl/nor-or-nand-and' into maint

2014-04-09 12:03:26 -07:00

clean.c

Merge branch 'jl/nor-or-nand-and'

2014-04-08 12:00:28 -07:00

clone.c

commit: fix patch hunk editing with "commit -p -m"

2014-03-18 11:25:12 -07:00

column.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

commit-tree.c

commit-tree: add and document --no-gpg-sign

2014-02-24 14:51:35 -08:00

commit.c

Merge branch 'jk/commit-C-pick-empty' into maint

2014-06-25 11:46:54 -07:00

config.c

config: teach "git config --file -" to read from the standard input

2014-02-18 16:12:14 -08:00

count-objects.c

count-objects: add -H option to humanize sizes

2013-04-10 13:27:26 -07:00

credential.c

…

describe.c

Merge branch 'nd/no-more-fnmatch'

2014-03-14 14:25:31 -07:00

diff-files.c

convert read_cache_preload() to take struct pathspec

2013-07-15 10:56:08 -07:00

diff-index.c

convert read_cache_preload() to take struct pathspec

2013-07-15 10:56:08 -07:00

diff-tree.c

…

diff.c

Merge branch 'tg/diff-no-index-refactor'

2013-12-27 14:58:17 -08:00

fast-export.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

fetch-pack.c

Merge branch 'nd/shallow-clone'

2014-01-17 12:21:20 -08:00

fetch.c

Merge branch 'ep/varscope'

2014-02-27 14:01:30 -08:00

fmt-merge-msg.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

for-each-ref.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

fsck.c

Merge branch 'mh/replace-refs-variable-rename'

2014-03-14 14:27:06 -07:00

gc.c

Merge branch 'nd/daemonize-gc' into maint

2014-06-25 11:47:36 -07:00

get-tar-commit-id.c

stop installing git-tar-tree link

2013-12-03 12:35:22 -08:00

grep.c

Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maint

2014-06-25 11:47:49 -07:00

hash-object.c

hash-object: replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP

2013-08-07 08:30:55 -07:00

help.c

builtin/help.c: speed up is_git_command() by checking for builtin commands first

2014-01-06 11:26:31 -08:00

index-pack.c

Merge branch 'jk/index-pack-report-missing' into maint

2014-06-25 11:48:14 -07:00

init-db.c

i18n: only extract comments marked with "TRANSLATORS:"

2014-04-17 11:09:56 -07:00

log.c

Merge branch 'jk/diff-follow-must-take-one-pathspec' into maint

2014-06-25 11:47:23 -07:00

ls-files.c

pathspec: pass directory indicator to match_pathspec_item()

2014-02-24 14:37:19 -08:00

ls-remote.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

ls-tree.c

pathspec: rename match_pathspec_depth() to match_pathspec()

2014-02-24 14:37:14 -08:00

mailinfo.c

Merge branch 'rs/mailinfo-header-cmp' into maint

2014-06-25 11:48:23 -07:00

mailsplit.c

mailsplit: sort maildir filenames more cleverly

2013-03-02 22:52:44 -08:00

merge-base.c

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

2014-02-13 13:38:59 -08:00

merge-file.c

Replace deprecated OPT_BOOLEAN by OPT_BOOL

2013-08-05 11:32:19 -07:00

merge-index.c

Convert "struct cache_entry *" to "const ..." wherever possible

2013-07-09 09:12:48 -07:00

merge-ours.c

…

merge-recursive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

merge-tree.c

merge-tree: handle directory/empty conflict correctly

2013-05-06 22:17:00 -07:00

merge.c

Merge branch 'jc/rev-parse-argh-dashed-multi-words'

2014-04-08 11:59:27 -07:00

mktag.c

…

mktree.c

builtin/mktree.c: use ALLOC_GROW() in append_to_tree()

2014-03-03 14:54:45 -08:00

mv.c

Merge branch 'dt/merge-recursive-case-insensitive' into maint

2014-06-25 11:48:34 -07:00

name-rev.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

notes.c

parse-options: multi-word argh should use dash to separate words

2014-03-24 10:43:34 -07:00

pack-objects.c

Merge branch 'jk/pack-bitmap'

2014-04-08 12:00:33 -07:00

pack-redundant.c

Fix sizeof usage in get_permutations

2012-12-13 11:13:44 -08:00

pack-refs.c

pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}

2013-05-01 15:33:11 -07:00

patch-id.c

…

prune-packed.c

i18n: mark all progress lines for translation

2014-02-24 09:08:37 -08:00

prune.c

Merge branch 'mh/replace-refs-variable-rename'

2014-03-14 14:27:06 -07:00

push.c

Merge branch 'cc/starts-n-ends-with-endgame'

2014-03-07 15:18:28 -08:00

read-tree.c

C: have space around && and || operators

2013-10-16 10:26:39 -07:00

receive-pack.c

shallow: automatically clean up shallow tempfiles

2014-02-27 12:07:13 -08:00

reflog.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'cc/starts-n-ends-with'

2013-12-17 12:02:44 -08:00

repack.c

Merge branch 'jk/repack-pack-keep-objects'

2014-03-18 13:50:29 -07:00

replace.c

Merge branch 'mh/replace-refs-variable-rename'

2014-03-14 14:27:06 -07:00

rerere.c

rerere: fix for merge.conflictstyle

2014-04-30 10:30:02 -07:00

reset.c

Merge branch 'nd/reset-setup-worktree'

2014-03-14 14:25:03 -07:00

rev-list.c

Merge branch 'jk/pack-bitmap'

2014-02-27 14:01:48 -08:00

rev-parse.c

rev-parse --parseopt: option argument name hints

2014-03-23 17:28:03 -07:00

revert.c

parse-options: multi-word argh should use dash to separate words

2014-03-24 10:43:34 -07:00

rm.c

Merge branch 'nd/submodule-pathspec-ending-with-slash'

2014-02-27 14:01:15 -08:00

send-pack.c

Merge branch 'nd/shallow-clone'

2014-01-17 12:21:20 -08:00

shortlog.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

show-branch.c

use wildmatch() directly without fnmatch() wrapper

2014-02-20 14:15:46 -08:00

show-ref.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

stripspace.c

builtin/stripspace.c: fix broken indentation

2013-09-06 13:33:17 -07:00

symbolic-ref.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

tag.c

parse-options: multi-word argh should use dash to separate words

2014-03-24 10:43:34 -07:00

unpack-file.c

…

unpack-objects.c

Merge branch 'mh/replace-refs-variable-rename'

2014-03-14 14:27:06 -07:00

update-index.c

update-index: fix segfault with missing --cacheinfo argument

2014-06-04 11:02:55 -07:00

update-ref.c

update-ref: fail create operation over stdin if ref already exists

2014-04-02 10:40:43 -07:00

update-server-info.c

…

upload-archive.c

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05 14:13:21 -08:00

var.c

…

verify-pack.c

…

verify-tag.c

gpg_interface: allow to request status return

2013-02-14 09:30:04 -08:00

write-tree.c

…