Junio C Hamano 5b307e95e8 Merge branch 'jk/pull-to-integrate' ...

* jk/pull-to-integrate:
  pull: change the description to "integrate" changes
  push: avoid suggesting "merging" remote changes

2013-07-12 12:04:06 -07:00

..

add.c

Merge branch 'jc/add-ignore-removal'

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

annotate.c

…

apply.c

Merge branch 'tr/maint-apply-non-git-patch-parsefix'

2013-06-26 15:08:09 -07:00

archive.c

pkt-line: provide a LARGE_PACKET_MAX static buffer

2013-02-20 13:42:22 -08:00

bisect--helper.c

i18n: bisect--helper: mark parseopt strings for translation

2012-08-20 12:23:15 -07:00

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

Merge branch 'maint'

2012-09-17 15:59:34 -07:00

check-ignore.c

Merge branch 'as/check-ignore'

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

check-ref-format.c

…

checkout-index.c

Use imperative form in help usage to describe an action

2012-08-22 12:02:28 -07:00

checkout.c

Merge branch 'rr/rebase-checkout-reflog'

2013-07-11 13:04:33 -07:00

clean.c

Merge branch 'as/check-ignore'

2013-01-23 21:19:10 -08:00

clone.c

refs: implement simple transactions for the packed-refs file

2013-06-20 15:50:17 -07:00

column.c

i18n: column: mark parseopt strings for translation

2012-08-20 12:23:16 -07:00

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-07-11 13:05:34 -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

update-index/diff-index: use core.preloadindex to improve performance

2012-11-02 11:38:29 -04:00

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

Merge branch 'nd/i18n-parseopt-help'

2012-09-07 11:09:09 -07:00

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

silence git gc --auto --quiet output

2012-09-27 17:57:26 -07:00

grep.c

Sync with 1.8.1 maintenance track

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

hash-object.c

i18n: hash-object: mark parseopt strings for translation

2012-08-20 12:23:17 -07:00

help.c

Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'

2013-06-26 15:07:48 -07:00

index-pack.c

clone: open a shortcut for connectivity check

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

init-db.c

i18n: init-db: mark parseopt strings for translation

2012-08-20 12:23:17 -07:00

log.c

Merge branch 'jc/topo-author-date-sort'

2013-07-01 12:41:23 -07:00

ls-files.c

Merge branch 'mh/ref-races'

2013-06-30 15:40:05 -07:00

ls-remote.c

ls-remote: document the '--get-url' option

2012-09-07 10:58:35 -07:00

ls-tree.c

pathspec: save the non-wildcard length part

2012-11-19 13:08:28 -08:00

mailinfo.c

Merge branch 'jc/same-encoding' into maint

2012-12-07 14:10:56 -08:00

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

i18n: merge-file: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

merge-index.c

Which merge_file() function do you mean?

2012-12-09 23:05:27 -08:00

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

i18n: mktree: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

mv.c

i18n: mv: mark parseopt strings for translation

2012-08-20 12:23:18 -07:00

name-rev.c

name-rev: allow to specify a subpath for --refs option

2013-06-18 12:02:02 -07:00

notes.c

Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'

2013-06-26 15:07:48 -07:00

pack-objects.c

Merge branch 'jk/peel-ref'

2012-10-25 06:42:27 -04:00

pack-redundant.c

Fix sizeof usage in get_permutations

2012-12-13 11:13:44 -08:00

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

Merge branch 'jk/pull-to-integrate'

2013-07-12 12:04:06 -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

fix "builtin-*" references to be "builtin/*"

2013-06-18 11:05:51 -07:00

rerere.c

i18n: rerere: mark parseopt strings for translation

2012-08-20 12:23:19 -07:00

reset.c

pretty: --format output should honor logOutputEncoding

2013-06-26 11:40:31 -07:00

rev-list.c

pretty: --format output should honor logOutputEncoding

2013-06-26 11:40:31 -07:00

rev-parse.c

rev-parse: add --prefix option

2013-06-17 13:30:01 -07:00

revert.c

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

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

rm.c

rm: introduce advice.rmHints to shorten messages

2013-06-12 16:59:55 -07:00

send-pack.c

teach get_remote_heads to read from a memory buffer

2013-02-24 00:17:38 -08:00

shortlog.c

pretty: --format output should honor logOutputEncoding

2013-06-26 11:40:31 -07:00

show-branch.c

Merge branch 'jc/topo-author-date-sort'

2013-07-01 12:41:23 -07:00

show-ref.c

exclude_existing(): set existing_refs.strdup_strings

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

stripspace.c

Allow custom "comment char"

2013-01-16 12:48:22 -08:00

symbolic-ref.c

git symbolic-ref --delete $symref

2012-10-21 12:17:38 -07:00

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-index: allow "-h" to also display options

2013-02-23 23:49:33 -08:00

update-ref.c

Use imperative form in help usage to describe an action

2012-08-22 12:02:28 -07:00

update-server-info.c

i18n: update-server-info: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00

upload-archive.c

pkt-line: provide a LARGE_PACKET_MAX static buffer

2013-02-20 13:42:22 -08:00

var.c

…

verify-pack.c

i18n: verify-pack: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00

verify-tag.c

gpg_interface: allow to request status return

2013-02-14 09:30:04 -08:00

write-tree.c

i18n: write-tree: mark parseopt strings for translation

2012-08-22 10:58:29 -07:00