Junio C Hamano 61d7503da1 Merge branch 'jc/replacing' ... * jc/replacing: read_sha1_file(): allow selective bypassing of replacement mechanism inline lookup_replace_object() calls read_sha1_file(): get rid of read_sha1_file_repl() madness t6050: make sure we test not just commit replacement Declare lookup_replace_object() in cache.h, not in commit.h Conflicts: environment.c		2011-05-19 20:37:21 -07:00
..
add.c	Merge branch 'ci/commit--interactive-atomic'	2011-05-16 16:47:10 -07:00
annotate.c
apply.c	Merge branch 'jc/maint-add-p-overlapping-hunks'	2011-05-11 11:37:46 -07:00
archive.c	i18n: git-archive basic messages	2011-03-09 23:52:57 -08:00
bisect--helper.c
blame.c	Merge branch 'js/blame-parsename'	2011-05-06 10:50:32 -07:00
branch.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
bundle.c	i18n: git-bundle basic messages	2011-03-09 23:52:57 -08:00
cat-file.c	blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''	2010-09-29 16:53:25 -07:00
check-attr.c
check-ref-format.c	Allow "check-ref-format --branch" from subdirectory	2010-08-06 10:01:45 -07:00
checkout-index.c	Merge branch 'jn/git-cmd-h-bypass-setup'	2010-12-12 21:49:50 -08:00
checkout.c	Merge branch 'nd/struct-pathspec'	2011-05-06 10:50:06 -07:00
clean.c	i18n: git-clean clean.requireForce messages	2011-03-09 23:52:57 -08:00
clone.c	i18n: mark clone nonexistent repository message for translation	2011-04-12 00:12:53 -07:00
commit-tree.c	Sync with 1.7.3.2	2010-10-21 17:16:10 -07:00
commit.c	Merge branch 'ci/commit--interactive-atomic'	2011-05-16 16:47:10 -07:00
config.c	Merge branch 'lp/config-vername-check' into maint	2011-04-03 12:29:45 -07:00
count-objects.c	add description parameter to OPT__VERBOSE	2010-11-15 09:56:51 -08:00
describe.c	Merge branch 'lt/default-abbrev' into maint	2011-04-03 12:32:51 -07:00
diff-files.c	Convert struct diff_options to use struct pathspec	2011-02-03 12:28:15 -08:00
diff-index.c	Submodules: Use "ignore" settings from .gitmodules too for diff and status	2010-08-09 09:11:44 -07:00
diff-tree.c	diffcore-rename: fall back to -C when -C -C busts the rename limit	2011-03-22 14:29:07 -07:00
diff.c	Merge branch 'jc/rename-degrade-cc-to-c'	2011-04-28 14:11:43 -07:00
fast-export.c	Merge branch 'mg/placeholders-are-lowercase'	2011-02-27 21:58:30 -08:00
fetch-pack.c	Merge branch 'jc/fetch-progressive-stride'	2011-03-29 14:09:08 -07:00
fetch.c	Merge branch 'jl/submodule-fetch-on-demand'	2011-04-04 15:02:01 -07:00
fmt-merge-msg.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
for-each-ref.c	for-each-ref: fix objectname:short bug	2010-08-26 16:42:25 -07:00
fsck.c	Remove unused variables	2011-03-22 11:43:27 -07:00
gc.c	i18n: git-gc "Auto packing the repository" message	2011-03-09 23:52:57 -08:00
grep.c	Merge branch 'nd/struct-pathspec'	2011-05-06 10:50:06 -07:00
hash-object.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
help.c	Cast execl*() NULL sentinels to (char *)	2010-07-25 23:14:18 -07:00
index-pack.c	sparse: Fix an "symbol 'cmd_index_pack' not declared" warning	2011-04-11 10:35:25 -07:00
init-db.c	i18n: mark init-db messages for translation	2011-04-12 10:46:29 -07:00
log.c	Merge branch 'cn/format-patch-quiet' into maint	2011-05-15 16:10:49 -07:00
ls-files.c	pathspec: rename per-item field has_wildcard to use_wildcard	2011-04-05 09:30:36 -07:00
ls-remote.c	get_remote_url(): use the same data source as ls-remote to get remote urls	2011-03-02 12:26:53 -08:00
ls-tree.c	pathspec: rename per-item field has_wildcard to use_wildcard	2011-04-05 09:30:36 -07:00
mailinfo.c	commit: helper methods to reduce redundant blocks of code	2010-11-04 13:53:34 -07:00
mailsplit.c	Use parentheses and `...' where appropriate	2010-10-08 12:31:07 -07:00
merge-base.c	Documentation: update to git-merge-base --octopus	2011-04-15 10:13:52 -07:00
merge-file.c	Merge branch 'rs/opt-help-text'	2010-11-24 15:55:19 -08:00
merge-index.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
merge-ours.c
merge-recursive.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
merge-tree.c	sparse: Fix an "symbol 'merge_file' not decared" warning	2011-04-11 10:35:25 -07:00
merge.c	Merge branch 'jk/cherry-pick-root-with-resolve'	2011-05-19 20:37:19 -07:00
mktag.c	read_sha1_file(): get rid of read_sha1_file_repl() madness	2011-05-15 15:23:33 -07:00
mktree.c
mv.c	i18n: git-mv "bad" messages	2011-03-09 23:52:56 -08:00
name-rev.c	object.h: Add OBJECT_ARRAY_INIT macro and make use of it.	2010-08-29 22:42:49 -07:00
notes.c	Merge branch 'jk/notes-ui-updates'	2011-05-02 15:58:50 -07:00
pack-objects.c	Teach core.bigfilethreashold to pack-objects	2011-04-05 20:25:49 -07:00
pack-redundant.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
pack-refs.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
patch-id.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
prune-packed.c
prune.c	add description parameter to OPT__DRY_RUN	2010-11-15 09:57:37 -08:00
push.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
read-tree.c	Make <identifier> lowercase as per CodingGuidelines	2011-02-15 11:53:10 -08:00
receive-pack.c	sparse: Fix errors and silence warnings	2011-04-03 10:14:53 -07:00
reflog.c	Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'	2010-05-21 04:02:18 -07:00
remote-ext.c	Remove unused variables	2011-03-22 11:43:27 -07:00
remote-fd.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
remote.c	Merge branch 'jk/maint-remote-mirror-safer'	2011-04-06 10:38:14 -07:00
replace.c
rerere.c	rerere: libify rerere_clear() and rerere_gc()	2011-05-08 12:55:34 -07:00
reset.c	Merge branch 'ab/i18n-st'	2011-04-01 17:55:55 -07:00
rev-list.c	rev-list --count: separate count for --cherry-mark	2011-04-26 13:13:20 -07:00
rev-parse.c	revision.c: introduce --min-parents and --max-parents options	2011-03-23 10:16:44 -07:00
revert.c	revert: allow reverting a root commit	2011-05-16 13:01:45 -07:00
rm.c	i18n: git-rm basic messages	2011-03-09 23:52:56 -08:00
send-pack.c	Merge branch 'jk/git-connection-deadlock-fix'	2011-05-19 20:37:20 -07:00
shortlog.c	sparse: Fix an "symbol 'format_subject' not declared" warning	2011-04-11 10:35:25 -07:00
show-branch.c	Share color list between graph and show-branch	2011-04-04 23:20:39 -07:00
show-ref.c	Describe various forms of "be quiet" using OPT__QUIET	2010-11-15 10:04:56 -08:00
stripspace.c
symbolic-ref.c	Describe various forms of "be quiet" using OPT__QUIET	2010-11-15 10:04:56 -08:00
tag.c	tag: disallow '-' as tag name	2011-05-10 08:45:37 -07:00
tar-tree.c
unpack-file.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
unpack-objects.c	do not depend on signed integer overflow	2010-10-06 11:10:07 -07:00
update-index.c	Convert ce_path_match() to use struct pathspec	2011-02-03 14:08:30 -08:00
update-ref.c
update-server-info.c	add OPT__FORCE	2010-11-15 10:04:43 -08:00
upload-archive.c
var.c	Fix sparse warnings	2011-03-22 10:16:54 -07:00
verify-pack.c
verify-tag.c	Merge branch 'mg/maint-tag-rfc1991'	2010-12-08 11:24:13 -08:00
write-tree.c