git/builtin
Junio C Hamano 175008d454 Merge branch 'jc/merge-refuse-new-root'
"git pull" has been taught to pass --allow-unrelated-histories
option to underlying "git merge".

* jc/merge-refuse-new-root:
  pull: pass --allow-unrelated-histories to "git merge"
  t3033: avoid 'ambiguous refs' warning
2016-04-29 12:59:08 -07:00
..
add.c
am.c
annotate.c
apply.c Merge branch 'cc/apply' 2016-04-13 14:12:34 -07:00
archive.c
bisect--helper.c
blame.c Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' 2016-04-13 14:12:41 -07:00
branch.c Merge branch 'jk/branch-shortening-funny-symrefs' 2016-04-18 10:49:14 -07:00
bundle.c
cat-file.c
check-attr.c
check-ignore.c
check-mailmap.c
check-ref-format.c
checkout-index.c
checkout.c checkout_paths(): remove unneeded flag variable 2016-04-10 11:35:36 -07:00
clean.c
clone.c Merge branch 'sb/submodule-parallel-update' 2016-04-06 11:39:01 -07:00
column.c
commit-tree.c
commit.c Merge branch 'ad/commit-have-m-option' 2016-04-22 15:45:07 -07:00
config.c Merge branch 'jk/config-get-urlmatch' 2016-04-03 10:29:26 -07:00
count-objects.c
credential.c
describe.c
diff-files.c
diff-index.c
diff-tree.c
diff.c
fast-export.c
fetch-pack.c
fetch.c Merge branch 'sb/submodule-parallel-update' 2016-04-06 11:39:01 -07:00
fmt-merge-msg.c
for-each-ref.c
fsck.c fsck_head_link(): remove unneeded flag variable 2016-04-10 11:35:33 -07:00
gc.c
get-tar-commit-id.c
grep.c Merge branch 'jk/tighten-alloc' into maint 2016-03-10 11:13:43 -08:00
hash-object.c
help.c
index-pack.c Merge branch 'jc/index-pack' 2016-04-03 10:29:31 -07:00
init-db.c Merge branch 'jk/check-repository-format' 2016-04-13 14:12:28 -07:00
interpret-trailers.c
log.c Merge branch 'lt/pretty-expand-tabs' 2016-04-13 14:12:36 -07:00
ls-files.c
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 Merge branch 'en/merge-trivial-fix' 2016-04-25 15:17:15 -07:00
mktag.c
mktree.c
mv.c Merge branch 'sb/mv-submodule-fix' 2016-04-29 12:59:07 -07:00
name-rev.c
notes.c Merge branch 'sb/misc-cleanups' 2016-04-13 14:12:34 -07:00
pack-objects.c Merge branch 'maint-2.5' into maint-2.6 2016-03-17 11:26:18 -07:00
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c
prune.c
pull.c Merge branch 'jc/merge-refuse-new-root' 2016-04-29 12:59:08 -07:00
push.c
read-tree.c
receive-pack.c Merge branch 'dt/pre-refs-backend' 2016-04-25 15:17:15 -07:00
reflog.c
remote-ext.c
remote-fd.c
remote.c
repack.c
replace.c Merge branch 'js/replace-edit-use-editor-configuration' 2016-04-29 12:59:07 -07:00
rerere.c
reset.c
rev-list.c Merge branch 'maint-2.4' into maint-2.5 2016-03-17 11:24:14 -07:00
rev-parse.c Merge branch 'jk/rev-parse-local-env-vars' 2016-04-03 10:29:27 -07:00
revert.c
rm.c
send-pack.c Merge branch 'sk/send-pack-all-fix' 2016-04-13 14:12:33 -07:00
shortlog.c
show-branch.c
show-ref.c
stripspace.c
submodule--helper.c Merge branch 'sb/submodule-helper-clone-regression-fix' 2016-04-22 15:45:04 -07:00
symbolic-ref.c
tag.c tag: add the option to force signing of annotated tags 2016-03-22 15:13:40 -07:00
unpack-file.c
unpack-objects.c
update-index.c
update-ref.c
update-server-info.c
upload-archive.c
var.c
verify-commit.c
verify-pack.c
verify-tag.c
worktree.c worktree: add: introduce --checkout option 2016-03-29 11:12:36 -07:00
write-tree.c