Junio C Hamano 423ecb0bb6 Merge branch 'jk/merge-tree-added-identically' ...

* jk/merge-tree-added-identically:
  merge-tree: handle directory/empty conflict correctly

2013-05-06 22:18:25 -07:00

..

add.c

Merge branch 'jc/add-ignore-removal'

2013-04-26 15:28:09 -07:00

annotate.c

…

apply.c

Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint

2013-04-22 11:26:56 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'nd/pretty-formats'

2013-04-23 11:22:48 -07:00

branch.c

branch: colour upstream branches

2013-04-15 11:04:44 -07:00

bundle.c

…

cat-file.c

cat-file: print tags raw for "cat-file -p"

2013-04-17 14:48:45 -07:00

check-attr.c

…

check-ignore.c

dir.c: git-status --ignored: don't scan the work tree twice

2013-04-15 12:36:42 -07:00

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'nd/checkout-keep-sparse'

2013-04-22 11:11:40 -07:00

clean.c

…

clone.c

Merge branch 'jk/check-corrupt-objects-carefully'

2013-04-28 11:57:54 -07:00

column.c

…

commit-tree.c

commit-tree: document -S option consistently

2013-03-25 15:01:22 -07:00

commit.c

pretty: save commit encoding from logmsg_reencode if the caller needs it

2013-04-18 16:28:27 -07:00

config.c

…

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 'jc/describe' into maint

2013-04-03 09:25:52 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

…

fast-export.c

fast-export: add --signed-tags=warn-strip mode

2013-04-15 09:02:25 -07:00

fetch-pack.c

Merge branch 'jk/pkt-line-cleanup'

2013-04-01 08:59:37 -07:00

fetch.c

…

fmt-merge-msg.c

Merge branch 'rt/commentchar-fmt-merge-msg'

2013-04-15 12:40:56 -07:00

for-each-ref.c

…

fsck.c

…

gc.c

…

grep.c

Sync with 1.8.1 maintenance track

2013-04-03 09:18:01 -07:00

hash-object.c

…

help.c

help: mark common_guides[] as translatable

2013-04-12 09:49:00 -07:00

index-pack.c

Merge branch 'nd/index-pack-threaded-fixes' into maint

2013-04-04 13:00:41 -07:00

init-db.c

…

log.c

Merge branch 'rr/shortlog-doc'

2013-04-26 15:28:39 -07:00

ls-files.c

dir.c: replace is_path_excluded with now equivalent is_excluded API

2013-04-15 12:34:01 -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-tree: handle directory/empty conflict correctly

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

merge.c

Merge branch 'jc/merge-tag-object' into maint

2013-04-24 16:14:06 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

…

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1

2013-04-03 08:43:03 -07:00

push.c

remote.c: introduce a way to have different remotes for fetch/push

2013-04-02 10:41:42 -07:00

read-tree.c

…

receive-pack.c

Merge branch 'jk/receive-pack-deadlocks-with-early-failure'

2013-04-23 11:16:50 -07:00

reflog.c

Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maint

2013-03-26 12:39:51 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

remote: check for superfluous arguments in 'git remote add'

2013-04-24 13:12:51 -07:00

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

cherry-pick/revert: make usage say '<commit-ish>...'

2013-04-24 09:48:01 -07:00

rm.c

rm: do not complain about d/f conflicts during deletion

2013-04-04 12:28:47 -07:00

send-pack.c

…

shortlog.c

builtin/shortlog.c: make usage string consistent with log

2013-04-22 08:00:54 -07:00

show-branch.c

show-branch: use strbuf instead of static buffer

2013-04-06 18:57:15 -07:00

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

Merge branch 'ph/tag-force-no-warn-on-creation' into maint

2013-04-03 09:24:51 -07:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…