Junio C Hamano 3a335ee2da Merge branch 'jc/maint-blame-unique-abbrev' ...

"git blame" did not try to make sure the abbreviated commit object
names in its output are unique.

* jc/maint-blame-unique-abbrev:
  blame: compute abbreviation width that ensures uniqueness

2012-07-09 09:01:38 -07:00

..

add.c

Merge branch 'jc/ls-files-i-dir'

2012-06-21 14:42:07 -07:00

annotate.c

…

apply.c

i18n: apply: split to fix a partial i18n message

2012-06-01 07:43:10 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'jc/maint-blame-unique-abbrev'

2012-07-09 09:01:38 -07:00

branch.c

branch: remove lego in i18n tracking info strings

2012-05-04 09:12:24 -07:00

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'ap/checkout-no-progress-for-non-tty'

2012-05-25 12:06:34 -07:00

clean.c

…

clone.c

Merge branch 'nd/clone-single-fix'

2012-07-04 23:41:41 -07:00

column.c

Add column layout skeleton and git-column

2012-04-27 09:26:37 -07:00

commit-tree.c

…

commit.c

ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT

2012-05-24 17:16:41 -07:00

config.c

config: write to $XDG_CONFIG_HOME/git/config file when appropriate

2012-06-25 09:06:15 -07:00

count-objects.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

fix pager.diff with diff --no-index

2012-06-15 14:27:35 -07:00

fast-export.c

Merge branch 'js/maint-fast-export-mark-error' into maint

2012-06-17 14:00:03 -07:00

fetch-pack.c

Merge branch 'jk/fetch-pack-remove-dups-optim'

2012-05-29 13:09:08 -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

Merge branch 'jc/fmt-merge-msg-people'

2012-06-12 08:33:30 -07:00

for-each-ref.c

…

fsck.c

…

gc.c

gc: use argv-array for sub-commands

2012-04-18 16:17:42 -07:00

grep.c

Merge branch 'mm/verify-filename-fix'

2012-06-28 15:19:32 -07:00

hash-object.c

…

help.c

Restore use of 'help.format' configuration property in 'git help'

2012-06-22 11:06:08 -07:00

index-pack.c

Merge branch 'rj/platform-pread-may-be-thread-unsafe'

2012-07-09 09:00:45 -07:00

init-db.c

…

log.c

move git_version_string into version.c

2012-06-03 13:11:34 -07:00

ls-files.c

path_excluded(): update API to less cache-entry centric

2012-06-05 21:22:36 -07:00

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

remove superfluous newlines in error messages

2012-04-30 15:45:51 -07:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT

2012-05-24 17:16:41 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

pack-objects: use streaming interface for reading large loose blobs

2012-05-29 10:50:56 -07:00

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

reflog: remove i18n legos in pruning message

2012-06-07 11:49:16 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

remote: fix typo

2012-05-20 18:48:10 -07:00

replace.c

…

rerere.c

…

reset.c

verify_filename(): ask the caller to chose the kind of diagnosis

2012-06-18 15:21:42 -07:00

rev-list.c

Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint

2012-05-14 11:46:16 -07:00

rev-parse.c

Merge branch 'mm/verify-filename-fix'

2012-06-28 15:19:32 -07:00

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

ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT

2012-05-24 17:16:41 -07:00

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

remove superfluous newlines in error messages

2012-04-30 15:45:51 -07:00

update-index.c

Merge branch 'hv/submodule-update-nuke-submodules'

2012-06-28 15:20:08 -07:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT

2012-05-24 17:16:41 -07:00

verify-pack.c

…

verify-tag.c

…

write-tree.c

…