Johannes Schindelin 7720efbbee fixup! Merge 'cat-file-smudge' ...

This reverts commit 7576a30b53, reversing
changes made to 6de9d8ad27.

The patch series has been sent upstream and modifications were necessary
as a consequence. We will merge the new version of the patch series in
one moment.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

2016-08-24 14:07:14 +02:00

..

add.c

add: add --chmod=+x / --chmod=-x options

2016-06-07 17:43:39 -07:00

am.c

Merge branch 'jk/reset-ident-time-per-commit' into maint

2016-08-12 09:16:56 -07:00

annotate.c

…

apply.c

Merge branch 'rs/apply-name-terminate'

2016-06-03 14:38:04 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'mh/blame-worktree' into maint

2016-08-08 14:21:32 -07:00

branch.c

Merge branch 'va/i18n-misc-updates' into maint

2016-05-26 13:17:20 -07:00

bundle.c

…

cat-file.c

fixup! Merge 'cat-file-smudge'

2016-08-24 14:07:14 +02:00

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

add: add --chmod=+x / --chmod=-x options

2016-06-07 17:43:39 -07:00

clean.c

Merge branch 'clean-long-paths'

2016-08-13 07:35:12 +02:00

clone.c

remote-helper: check helper status after import/export

2016-08-13 07:33:38 +02:00

column.c

…

commit-tree.c

Merge branch 'jc/commit-tree-ignore-commit-gpgsign'

2016-05-13 13:18:27 -07:00

commit.c

Merge branch 'status-no-lock-index'

2016-08-13 07:36:38 +02:00

config.c

Merge branch 'jk/config-get-urlmatch' into maint

2016-04-14 18:57:43 -07:00

count-objects.c

…

credential.c

…

describe.c

…

diff-files.c

diff: run arguments through precompose_argv

2016-05-13 14:35:49 -07:00

diff-index.c

diff: run arguments through precompose_argv

2016-05-13 14:35:49 -07:00

diff-tree.c

Merge branch 'ar/diff-args-osx-precompose' into maint

2016-06-06 14:27:35 -07:00

diff.c

Merge branch 'ar/diff-args-osx-precompose' into maint

2016-06-06 14:27:35 -07:00

fast-export.c

fast-export: do not refer to non-existing marks

2016-08-13 07:33:36 +02:00

fetch-pack.c

…

fetch.c

Merge branch 'km/fetch-do-not-free-remote-name' into maint

2016-07-11 10:44:10 -07:00

fmt-merge-msg.c

use strbuf_addstr() instead of strbuf_addf() with "%s"

2016-08-05 15:09:25 -07:00

for-each-ref.c

…

fsck.c

Merge branch 'nd/pack-ofs-4gb-limit' into maint

2016-08-08 14:21:36 -07:00

gc.c

gc/repack: release packs when needed

2016-08-13 07:35:25 +02:00

get-tar-commit-id.c

…

grep.c

Merge branch 'nd/ita-cleanup' into maint

2016-07-28 11:25:51 -07:00

hash-object.c

…

help.c

Revert "display HTML in default browser using Windows' shell API"

2016-08-13 07:33:49 +02:00

index-pack.c

index-pack: correct "offset" type in unpack_entry_data()

2016-07-13 09:15:08 -07:00

init-db.c

mingw: respect core.hidedotfiles = false in git-init again

2016-08-13 07:36:23 +02:00

interpret-trailers.c

…

log.c

rebase: avoid computing unnecessary patch IDs

2016-08-13 07:36:15 +02:00

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

builtin/mailsplit.c: use error_errno()

2016-05-09 12:29:08 -07:00

merge-base.c

…

merge-file.c

builtin/merge-file.c: use error_errno()

2016-05-09 12:29:08 -07:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

struct name_entry: use struct object_id instead of unsigned char sha1[20]

2016-04-25 14:23:42 -07:00

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' into HEAD

2016-05-18 14:40:05 -07:00

name-rev.c

Merge branch 'js/name-rev-use-oldest-ref' into maint

2016-05-31 14:08:26 -07:00

notes.c

Merge branch 'sb/misc-cleanups' into HEAD

2016-05-18 14:40:15 -07:00

pack-objects.c

Merge branch 'nd/pack-ofs-4gb-limit' into maint

2016-08-08 14:21:36 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

Merge branch 'rs/patch-id-use-skip-prefix'

2016-06-03 14:38:03 -07:00

prune-packed.c

…

prune.c

…

pull.c

Merge branch 'va/i18n-misc-updates'

2016-05-17 14:38:23 -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

struct name_entry: use struct object_id instead of unsigned char sha1[20]

2016-04-25 14:23:42 -07:00

remote-ext.c

typofix: assorted typofixes in comments, documentation and messages

2016-05-06 13:16:37 -07:00

remote-fd.c

…

remote.c

i18n: remote: add comment for translators

2016-05-09 12:20:40 -07:00

repack.c

gc/repack: release packs when needed

2016-08-13 07:35:25 +02:00

replace.c

Merge branch 'js/replace-edit-use-editor-configuration' into maint

2016-05-06 14:53:24 -07:00

rerere.c

…

reset.c

Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maint

2016-07-28 11:25:50 -07:00

rev-list.c

Merge branch 'jk/rev-list-count-with-bitmap' into maint

2016-06-27 09:56:24 -07:00

rev-parse.c

use strbuf_addstr() for adding constant strings to a strbuf

2016-08-01 13:42:10 -07:00

revert.c

parse_options: allocate a new array when concatenating

2016-07-06 10:11:08 -07:00

rm.c

Merge branch 'rs/rm-strbuf-optim' into maint

2016-08-10 11:55:24 -07:00

send-pack.c

Merge branch 'sk/send-pack-all-fix' into maint

2016-04-29 14:15:57 -07:00

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

submodule--helper.c

submodule: remove bashism from shell script

2016-06-01 11:32:53 -07:00

symbolic-ref.c

…

tag.c

Merge branch 'st/verify-tag'

2016-04-29 12:59:09 -07:00

unpack-file.c

…

unpack-objects.c

…

update-index.c

builtin/update-index.c: prefer "err" to "errno" in process_lstat_error

2016-05-09 12:29:08 -07:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

builtin/upload-archive.c: use error_errno()

2016-05-09 12:29:08 -07:00

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

verify-tag: move tag verification code to tag.c

2016-04-22 14:06:46 -07:00

worktree.c

Merge branch 'nd/worktree-various-heads'

2016-05-23 14:54:29 -07:00

write-tree.c

…