Junio C Hamano 07e74b0da2 Merge branch 'ct/advise-push-default' into maint ...

The cases "git push" fails due to non-ff can be broken into three
categories; each case is given a separate advise message.

By Christopher Tiwald (2) and Jeff King (1)
* ct/advise-push-default:
  Fix httpd tests that broke when non-ff push advice changed
  clean up struct ref's nonfastforward field
  push: Provide situational hints for non-fast-forward errors

2012-05-11 11:18:43 -07:00

..

add.c

…

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'jc/maint-blame-minimal' into maint

2012-05-01 21:11:49 -07:00

branch.c

…

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

…

clean.c

…

clone.c

…

commit-tree.c

…

commit.c

Merge branch 'jc/commit-unedited-template' into maint

2012-04-26 10:35:15 -07:00

config.c

…

count-objects.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

…

fast-export.c

…

fetch-pack.c

Merge branch 'it/fetch-pack-many-refs' into maint

2012-05-01 21:12:36 -07:00

fetch.c

Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maint

2012-05-03 15:29:25 -07:00

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

…

grep.c

…

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

…

log.c

…

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 'jc/merge-reduce-parents-early' into maint

2012-05-03 15:36:15 -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

…

push.c

Merge branch 'ct/advise-push-default' into maint

2012-05-11 11:18:43 -07:00

read-tree.c

…

receive-pack.c

…

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

…

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

Merge branch 'cc/fix-missing-va-end-in-revert' into maint

2012-05-10 10:32:43 -07:00

rm.c

…

send-pack.c

teach send-pack about --[no-]progress

2012-05-01 09:40:30 -07:00

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

…

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

…