Junio C Hamano 1a22bd31f0 Merge branch 'jg/status-config' ...

"git status" learned status.branch and status.short configuration
variables to use --branch and --short options by default (override
with --no-branch and --no-short options from the command line).

* jg/status-config:
  status: introduce status.branch to enable --branch by default
  status: introduce status.short to enable --short by default

2013-06-23 14:51:59 -07:00

..

add.c

Merge branch 'jc/add-ignore-removal'

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

annotate.c

…

apply.c

use logical OR (||) instead of binary OR (|) in logical context

2013-06-13 14:47:07 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'tr/line-log'

2013-06-02 16:00:44 -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

Merge branch 'as/check-ignore'

2013-05-29 14:23:40 -07:00

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'jh/checkout-auto-tracking'

2013-05-29 14:23:10 -07:00

clean.c

…

clone.c

Merge branch 'nd/clone-connectivity-shortcut'

2013-06-06 12:17:55 -07:00

column.c

…

commit-tree.c

commit-tree: document -S option consistently

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

commit.c

Merge branch 'jg/status-config'

2013-06-23 14:51:59 -07:00

config.c

Merge branch 'mm/color-auto-default'

2013-06-20 16:02:33 -07: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 'mh/reflife'

2013-06-14 08:46:14 -07:00

diff-files.c

…

diff-index.c

…

diff-tree.c

…

diff.c

cmd_diff(): make it obvious which cases are exclusive of each other

2013-05-28 09:25:01 -07:00

fast-export.c

fast-{import,export}: use get_sha1_hex() to read from marks file

2013-05-07 16:20:40 -07:00

fetch-pack.c

Merge branch 'jk/pkt-line-cleanup'

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

fetch.c

Merge branch 'mh/reflife'

2013-06-14 08:46:14 -07:00

fmt-merge-msg.c

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

2013-04-26 11:10:47 -07:00

for-each-ref.c

…

fsck.c

fsck: don't put a void*-shaped peg in a char*-shaped hole

2013-05-28 09:25:01 -07:00

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

clone: open a shortcut for connectivity check

2013-05-28 08:07:20 -07:00

init-db.c

…

log.c

Merge branch 'tr/line-log'

2013-06-02 16:00:44 -07:00

ls-files.c

use logical OR (||) instead of binary OR (|) in logical context

2013-06-13 14:47:07 -07:00

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

mailsplit: sort maildir filenames more cleverly

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

merge-base.c

use logical OR (||) instead of binary OR (|) in logical context

2013-06-13 14:47:07 -07:00

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: use help_unknown_ref()

2013-05-08 15:34:33 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

…

pack-redundant.c

…

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

prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()

2013-05-28 09:20:54 -07:00

prune.c

Merge branch 'nd/prune-packed-dryrun-verbose'

2013-06-06 12:17:52 -07:00

push.c

push: make push.default = current use resolved HEAD

2013-05-29 15:34:07 -07:00

read-tree.c

diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const

2013-06-02 15:31:14 -07:00

receive-pack.c

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

2013-04-26 11:12:17 -07:00

reflog.c

Merge branch 'jc/prune-all'

2013-05-29 14:23:04 -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

exclude_existing(): set existing_refs.strdup_strings

2013-06-02 15:28:47 -07:00

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

…