1
0
mirror of https://github.com/git/git.git synced 2024-10-20 01:48:55 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Christian Couder b0fa7ab51b git: add --no-replace-objects option to disable replacing
Commit dae556b (environment: add global variable to disable replacement)
adds a variable to enable/disable replacement, and it is enabled by
default for most commands.

So there is no way to disable it for some commands, which is annoying
when we want to get information about a commit that has been replaced.

For example:

$ git cat-file -p N

would output information about the replacement commit if commit N is
replaced.

With the "--no-replace-objects" option that this patch adds it is
possible to get information about the original commit using:

$ git --no-replace-objects cat-file -p N

While at it, let's add some documentation about this new option in the
"git replace" man page too.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-10-13 01:07:29 -07:00
block-sha1 remove ARM and Mozilla SHA1 implementations 2009-08-18 14:19:40 -07:00
compat Merge branch 'ms/msvc' 2009-10-09 00:02:23 -07:00
contrib bash: add support for 'git replace' 2009-10-09 15:36:41 -07:00
Documentation git: add --no-replace-objects option to disable replacing 2009-10-13 01:07:29 -07:00
git-gui
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2009-09-20 23:47:52 -07:00
gitweb Merge branch 'mr/gitweb-snapshot' 2009-08-31 22:09:53 -07:00
perl perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR 2009-09-25 14:00:04 -07:00
ppc
t git: add --no-replace-objects option to disable replacing 2009-10-13 01:07:29 -07:00
templates Correct minor typo in post-receive hook template 2009-09-29 08:26:43 -07:00
xdiff Merge branch 'tf/diff-whitespace-incomplete-line' into maint 2009-09-16 14:27:08 -07:00
.gitattributes
.gitignore Add scripts to generate projects for other buildsystems (MSVC vcproj, QMake) 2009-09-18 20:00:42 -07:00
.mailmap Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
abspath.c abspath.c: move declaration of 'len' into inner block and use appropriate type 2009-08-27 16:20:53 -07:00
advice.c status: make "how to stage" messages optional 2009-09-11 21:33:24 -07:00
advice.h status: make "how to stage" messages optional 2009-09-11 21:33:24 -07:00
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c Merge branch 'rs/maint-archive-prefix' 2009-10-09 16:27:16 -07:00
archive.h
attr.c
attr.h
base85.c
bisect.c git-bisect: call the found commit "*the* first bad commit" 2009-08-26 12:05:57 -07:00
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin-add.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
builtin-annotate.c
builtin-apply.c builtin-apply.c: get rid of an unnecessary use of temporary array 2009-09-01 08:02:51 -07:00
builtin-archive.c git-archive: infer output format from filename when unspecified 2009-09-13 13:54:39 -07:00
builtin-bisect--helper.c
builtin-blame.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
builtin-branch.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-bundle.c Update the usage bundle string. 2009-09-18 19:47:15 -07:00
builtin-cat-file.c
builtin-check-attr.c
builtin-check-ref-format.c
builtin-checkout-index.c
builtin-checkout.c Merge branch 'jk/maint-1.6.3-checkout-unborn' into maint 2009-09-16 14:26:56 -07:00
builtin-clean.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-clone.c make 'git clone' ask the remote only for objects it cares about 2009-09-26 12:51:04 -07:00
builtin-commit-tree.c
builtin-commit.c git commit --dry-run -v: show diff in color when asked 2009-08-15 02:33:21 -07:00
builtin-config.c
builtin-count-objects.c
builtin-describe.c git-describe: Die early if there are no possible descriptions 2009-08-06 13:35:55 -07:00
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c
builtin-diff.c Show usage string for 'git log -h', 'git show -h' and 'git diff -h' 2009-08-07 14:40:29 -07:00
builtin-fast-export.c git fast-export: add --no-data option 2009-07-31 07:48:09 -07:00
builtin-fetch--tool.c
builtin-fetch-pack.c
builtin-fetch.c use write_str_in_full helper to avoid literal string lengths 2009-09-13 01:31:10 -07:00
builtin-fmt-merge-msg.c
builtin-for-each-ref.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
builtin-fsck.c Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
builtin-gc.c
builtin-grep.c Merge branch 'maint' 2009-09-13 01:30:53 -07:00
builtin-help.c
builtin-init-db.c Merge branch 'ns/init-mkdir' 2009-08-05 12:39:33 -07:00
builtin-log.c git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -07:00
builtin-ls-files.c ls-files: die instead of fprintf/exit in -i error 2009-10-08 22:54:34 -07:00
builtin-ls-remote.c
builtin-ls-tree.c
builtin-mailinfo.c builtin-mailinfo.c: check error status from rewind and ftruncate 2009-09-29 09:40:55 -07:00
builtin-mailsplit.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
builtin-merge-base.c git-merge-base/git-show-branch: Cleanup documentation and usage 2009-08-05 10:28:05 -07:00
builtin-merge-file.c
builtin-merge-ours.c
builtin-merge-recursive.c
builtin-merge.c Merge branch 'jk/maint-merge-msg-fix' 2009-08-16 04:13:04 -07:00
builtin-mktree.c
builtin-mv.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-name-rev.c
builtin-pack-objects.c pack-objects: remove SP at the end of usage string 2009-09-18 19:48:48 -07:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c
builtin-push.c git-push: Accept -n as a synonym for --dry-run. 2009-09-13 11:29:18 -07:00
builtin-read-tree.c read-tree: Fix regression with creation of a new index file. 2009-08-17 09:20:52 -07:00
builtin-receive-pack.c
builtin-reflog.c use write_str_in_full helper to avoid literal string lengths 2009-09-13 01:31:10 -07:00
builtin-remote.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
builtin-replace.c
builtin-rerere.c
builtin-reset.c Merge branch 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -07:00
builtin-rev-list.c
builtin-rev-parse.c
builtin-revert.c
builtin-rm.c
builtin-send-pack.c transport: pass "quiet" flag to pack-objects 2009-08-05 20:14:09 -07:00
builtin-shortlog.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
builtin-show-branch.c Merge branch 'maint' 2009-10-04 14:48:51 -07:00
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c
builtin-tag.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-tar-tree.c
builtin-unpack-objects.c Merge branch 'jc/maint-unpack-objects-strict' into maint 2009-09-16 14:45:18 -07:00
builtin-update-index.c
builtin-update-ref.c
builtin-update-server-info.c update-server-info: make builtin, use parseopt 2009-08-29 14:07:25 -07:00
builtin-upload-archive.c
builtin-verify-pack.c Merge branch 'maint' 2009-08-07 22:35:17 -07:00
builtin-verify-tag.c
builtin-write-tree.c
builtin.h update-server-info: make builtin, use parseopt 2009-08-29 14:07:25 -07:00
bundle.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
bundle.h
cache-tree.c
cache-tree.h
cache.h git branch -D: give a better error message when lockfile creation fails 2009-09-29 08:14:47 -07:00
check_bindir
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c
command-list.txt
commit.c use write_str_in_full helper to avoid literal string lengths 2009-09-13 01:31:10 -07:00
commit.h Merge branch 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -07:00
config.c Merge branch 'jk/unwanted-advices' 2009-09-13 01:33:18 -07:00
config.mak.in
configure.ac remove ARM and Mozilla SHA1 implementations 2009-08-18 14:19:40 -07:00
connect.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
convert.c
copy.c preserve mtime of local clone 2009-09-13 01:32:26 -07:00
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c Fix '--relative-date' 2009-10-03 06:04:38 -04:00
decorate.c
decorate.h
delta.h
diff-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
diff-lib.c Merge branch 'jc/shortstatus' 2009-08-28 19:38:19 -07:00
diff-no-index.c
diff.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c clean: require double -f options to nuke nested git repository and work tree 2009-07-29 12:22:30 -07:00
dir.h clean: require double -f options to nuke nested git repository and work tree 2009-07-29 12:22:30 -07:00
editor.c
entry.c check_path(): allow symlinked directories to checkout-index --prefix 2009-08-18 03:32:45 -07:00
environment.c Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c fast-import.c::validate_raw_date(): really validate the value 2009-10-07 13:05:03 -07:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl Merge branch 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -07:00
git-am.sh git-am: force egrep to use correct characters set 2009-09-25 15:35:05 -07:00
git-archimport.perl
git-bisect.sh git-bisect: call the found commit "*the* first bad commit" 2009-08-26 12:05:57 -07:00
git-compat-util.h add NORETURN_PTR for function pointers 2009-10-01 04:12:21 -04:00
git-cvsexportcommit.perl
git-cvsimport.perl cvs: initialize empty password 2009-09-17 00:38:49 -07:00
git-cvsserver.perl git-cvsserver: no longer use deprecated 'git-subcommand' commands 2009-09-02 18:41:42 -07:00
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh filter-branch: make the usage string fit on 80 chars terminals. 2009-08-18 13:35:55 -07:00
git-instaweb.sh Add support for the Mongoose web server. 2009-08-23 15:03:53 -07:00
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-parse-remote.sh
git-pull.sh pull: improve advice for unconfigured error case 2009-10-09 11:22:43 -07:00
git-quiltimport.sh
git-rebase--interactive.sh
git-rebase.sh rebase: use plumbing to show dirty state 2009-09-11 21:41:15 -07:00
git-relink.perl
git-repack.sh
git-request-pull.sh request-pull: optionally show a patch as well 2009-07-29 11:02:49 -07:00
git-send-email.perl send-email: fix mutt regex for grouped aliases 2009-10-01 04:18:36 -04:00
git-sh-setup.sh
git-stash.sh Merge branch 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -07:00
git-submodule.sh typo fix: Directory `...' exist, ...: s/exist/exists/ 2009-09-29 08:30:13 -07:00
git-svn.perl git-svn: hide find_parent_branch output in double quiet mode 2009-10-10 00:00:40 -07:00
GIT-VERSION-GEN GIT 1.6.5 2009-10-10 00:05:19 -07:00
git-web--browse.sh web--browse: fix Mac OS X GUI detection for 10.6 2009-09-14 02:27:25 -07:00
git.c git: add --no-replace-objects option to disable replacing 2009-10-13 01:07:29 -07:00
git.spec.in Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
graph.c Merge branch 'as/maint-graph-interesting-fix' 2009-08-27 16:59:56 -07:00
graph.h
grep.c
grep.h Merge branch 'maint' 2009-09-13 01:30:53 -07:00
hash-object.c
hash.c
hash.h
help.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
help.h
http-fetch.c git-http-fetch: not a builtin 2009-08-05 18:37:12 -07:00
http-push.c
http-walker.c
http.c Merge branch 'maint' 2009-09-14 14:48:27 -07:00
http.h
ident.c
imap-send.c
index-pack.c increase portability of NORETURN declarations 2009-10-01 04:12:21 -04:00
INSTALL INSTALL: Describe dependency knobs from Makefile 2009-09-10 21:34:43 -07:00
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c Merge branch 'js/run-command-updates' 2009-08-10 22:14:57 -07:00
ll-merge.h
lockfile.c git branch -D: give a better error message when lockfile creation fails 2009-09-29 08:14:47 -07:00
log-tree.c improve reflog date/number heuristic 2009-09-29 10:06:49 -07:00
log-tree.h git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -07:00
mailmap.c
mailmap.h
Makefile Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options in Makefile 2009-10-09 14:38:14 -07:00
match-trees.c
merge-file.c
merge-index.c
merge-recursive.c merge-recursive: give less scary messages when merge did not start 2009-09-08 14:46:36 -07:00
merge-recursive.h
merge-tree.c
mktag.c Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
name-hash.c
object.c
object.h
pack-check.c
pack-redundant.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
parse-options.c parse-opt: ignore negation of OPT_NONEG for ambiguity checks 2009-09-29 07:28:47 -07:00
parse-options.h Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
patch-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
patch-id.c
patch-ids.c
patch-ids.h
path.c
pkt-line.c
pkt-line.h
preload-index.c
pretty.c git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -07:00
progress.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c reset: make the reminder output consistent with "checkout" 2009-08-21 21:19:35 -07:00
README README: git lives at http://git-scm.com these days 2009-10-07 12:47:24 -07:00
reflog-walk.c
reflog-walk.h
refs.c git branch -D: give a better error message when lockfile creation fails 2009-09-29 08:14:47 -07:00
refs.h
RelNotes GIT 1.6.4.4 2009-09-16 14:53:26 -07:00
remote-curl.c Use an external program to implement fetching with curl 2009-08-05 10:34:09 -07:00
remote.c Add url.<base>.pushInsteadOf: URL rewriting for push only 2009-09-08 01:18:46 -07:00
remote.h
replace_object.c
rerere.c use write_str_in_full helper to avoid literal string lengths 2009-09-13 01:31:10 -07:00
rerere.h
revision.c improve reflog date/number heuristic 2009-09-29 10:06:49 -07:00
revision.h improve reflog date/number heuristic 2009-09-29 10:06:49 -07:00
run-command.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
run-command.h Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
send-pack.h transport: pass "quiet" flag to pack-objects 2009-08-05 20:14:09 -07:00
server-info.c
setup.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
sha1_file.c Merge branch 'cc/replace' 2009-08-21 18:47:53 -07:00
sha1_name.c
sha1-lookup.c
sha1-lookup.h
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c strbuf: add new function strbuf_getwholeline() 2009-08-05 12:13:56 -07:00
strbuf.h strbuf: add new function strbuf_getwholeline() 2009-08-05 12:13:56 -07:00
string-list.c
string-list.h
symlinks.c lstat_cache: guard against full match of length of 'name' parameter 2009-07-29 20:20:12 -07:00
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c refactor test-date interface 2009-08-30 22:04:46 -07:00
test-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
test-dump-cache-tree.c
test-genrandom.c test-genrandom: ensure stdout is set to _O_BINARY on Windows 2009-09-21 00:36:12 -07:00
test-match-trees.c
test-parse-options.c parse-opt: ignore negation of OPT_NONEG for ambiguity checks 2009-09-29 07:28:47 -07:00
test-path-utils.c
test-sha1.c
test-sha1.sh
test-sigchain.c
thread-utils.c Make usage of windows.h lean and mean 2009-09-18 20:00:42 -07:00
thread-utils.h
trace.c
transport-helper.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
transport.c Merge branch 'maint' 2009-09-20 12:13:47 -07:00
transport.h Merge branch 'db/vcs-helper' 2009-09-13 01:31:55 -07:00
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-file.c
unpack-trees.c
unpack-trees.h
upload-pack.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
usage.c add NORETURN_PTR for function pointers 2009-10-01 04:12:21 -04:00
userdiff.c
userdiff.h
utf8.c
utf8.h
var.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
walker.c
walker.h
wrapper.c
write_or_die.c
ws.c
wt-status.c status: make "how to stage" messages optional 2009-09-11 21:33:24 -07:00
wt-status.h wt-status: collect untracked files in a separate "collect" phase 2009-08-10 12:56:43 -07:00
xdiff-interface.c
xdiff-interface.h

////////////////////////////////////////////////////////////////

	GIT - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public License.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org. To subscribe
to the list, send an email with just "subscribe git" in the body to
majordomo@vger.kernel.org. The mailing list archives are available at
http://marc.theaimsgroup.com/?l=git and other archival sites.

The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.