1
0
mirror of https://github.com/git/git.git synced 2024-10-03 14:01:22 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Eric Wong 733a65aa5d git-svn: allow dcommit to retain local merge information
dcommit will still rewrite the HEAD commit and the history of the first
parents of each HEAD~1, HEAD~2, HEAD~3 as it always has.

However, any merge parents (HEAD^2, HEAD^^2, HEAD~2^2) will now be
preserved when the new HEAD and HEAD~[0-9]+ commits are rewritten to SVN
with dcommit.  Commits written to SVN will still not have any merge
information besides anything in the commit message.

Thanks to Joakim Tjernlund, Junio C Hamano and Steven Grimm
for explanations, feedback, examples and test case.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-06-13 11:24:23 -07:00
arm War on whitespace 2007-06-07 00:04:01 -07:00
compat War on whitespace 2007-06-07 00:04:01 -07:00
contrib gitview: run blame with -C -C 2007-06-13 02:14:26 -07:00
Documentation Merge branch 'jc/blame' (early part) 2007-06-13 00:22:40 -07:00
git-gui Merge branch 'master' of git://repo.or.cz/git-gui 2007-06-12 00:14:47 -07:00
gitweb gitweb: change filename/directory name of snapshots 2007-06-12 22:22:06 -07:00
mozilla-sha1 War on whitespace 2007-06-07 00:04:01 -07:00
perl War on whitespace 2007-06-07 00:04:01 -07:00
ppc War on whitespace 2007-06-07 00:04:01 -07:00
t git-svn: allow dcommit to retain local merge information 2007-06-13 11:24:23 -07:00
templates Remove trailing slash from $(template_dir). 2007-06-12 00:23:31 -07:00
xdiff Missing statics. 2007-06-08 02:37:19 -07:00
.gitignore Makefile: add an explicit rule for building assembly output 2007-06-10 15:15:17 -07:00
.mailmap Add DLH to .mailmap 2007-05-30 10:45:55 -07:00
alloc.c Clean up object creation to use more common code 2007-04-16 23:36:16 -07:00
archive-tar.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
archive-zip.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
archive.h
attr.c Fix crash in t0020 (crlf conversion) 2007-04-22 10:44:56 -07:00
attr.h Fix funny types used in attribute value representation 2007-04-18 16:17:13 -07:00
base85.c decode_85(): fix missing return. 2007-05-30 15:03:50 -07:00
blob.c Clean up object creation to use more common code 2007-04-16 23:36:16 -07:00
blob.h
builtin-add.c git-add: allow path limiting with -u 2007-05-12 01:01:28 -07:00
builtin-annotate.c War on whitespace 2007-06-07 00:04:01 -07:00
builtin-apply.c git-apply: what is detected and fixed is not just trailing spaces. 2007-06-02 20:02:19 -07:00
builtin-archive.c connect: display connection progress 2007-05-16 12:48:18 -07:00
builtin-blame.c git-blame -w: ignore whitespace 2007-06-09 18:34:58 -07:00
builtin-branch.c Missing statics. 2007-06-08 02:37:19 -07:00
builtin-bundle.c Ensure return value from xread() is always stored into an ssize_t 2007-05-15 21:16:03 -07:00
builtin-cat-file.c Cleanup variables in cat-file 2007-04-22 00:43:24 -07:00
builtin-check-attr.c Fix funny types used in attribute value representation 2007-04-18 16:17:13 -07:00
builtin-check-ref-format.c
builtin-checkout-index.c _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file. 2007-04-03 23:44:32 -07:00
builtin-commit-tree.c init_buffer(): Kill buf pointer 2007-04-25 13:45:12 -07:00
builtin-config.c Update git-config documentation 2007-04-18 22:08:16 -07:00
builtin-count-objects.c Simplify index access condition in count-objects, pack-redundant 2007-05-29 23:30:11 -07:00
builtin-describe.c Teach git-describe how to run name-rev 2007-05-21 23:56:28 -07:00
builtin-diff-files.c Removing -n option from git-diff-files documentation 2007-04-26 22:43:10 -07:00
builtin-diff-index.c War on whitespace 2007-06-07 00:04:01 -07:00
builtin-diff-tree.c
builtin-diff.c Diff between two blobs should take mode changes into account now. 2007-04-24 00:08:49 -07:00
builtin-fetch--tool.c Merge branch 'sv/checkout' 2007-05-20 02:18:47 -07:00
builtin-fmt-merge-msg.c War on whitespace 2007-06-07 00:04:01 -07:00
builtin-for-each-ref.c
builtin-fsck.c War on whitespace 2007-06-07 00:04:01 -07:00
builtin-gc.c Make "git gc" pack all refs by default 2007-05-24 19:05:39 -07:00
builtin-grep.c sscanf/strtoul: parse integers robustly 2007-04-14 19:47:20 -07:00
builtin-init-db.c Remove trailing slash from $(template_dir). 2007-06-12 00:23:31 -07:00
builtin-log.c cmd_log_init: remove parsing of --encoding command line parameter 2007-06-09 02:03:30 -07:00
builtin-ls-files.c War on whitespace 2007-06-07 00:04:01 -07:00
builtin-ls-tree.c Merge branch 'jn/lstree' 2007-05-23 00:17:47 -07:00
builtin-mailinfo.c More missing static 2007-06-08 02:37:19 -07:00
builtin-mailsplit.c More missing static 2007-06-08 02:37:19 -07:00
builtin-merge-base.c
builtin-merge-file.c git-merge-file: refuse to merge binary files 2007-06-04 23:10:29 -07:00
builtin-mv.c Merge branch 'jc/index-output' 2007-04-07 02:26:24 -07:00
builtin-name-rev.c War on whitespace 2007-06-07 00:04:01 -07:00
builtin-pack-objects.c War on whitespace 2007-06-07 00:04:01 -07:00
builtin-pack-refs.c Make the pack-refs interfaces usable from outside 2007-05-26 20:00:55 -07:00
builtin-prune-packed.c
builtin-prune.c minor git-prune optimization 2007-03-20 22:17:47 -07:00
builtin-push.c Move refspec pattern matching to match_refs(). 2007-05-26 01:20:10 -07:00
builtin-read-tree.c Merge branch 'jc/read-tree-df' (early part) 2007-04-07 23:52:40 -07:00
builtin-reflog.c git-update-ref: add --no-deref option for overwriting/detaching ref 2007-05-10 15:24:44 -07:00
builtin-rerere.c War on whitespace 2007-06-07 00:04:01 -07:00
builtin-rev-list.c Add --date={local,relative,default} 2007-04-25 21:39:43 -07:00
builtin-rev-parse.c
builtin-revert.c More static 2007-06-13 02:02:10 -07:00
builtin-rm.c Add --ignore-unmatch option to exit with zero status when no files are removed. 2007-04-17 00:19:11 -07:00
builtin-runstatus.c
builtin-shortlog.c War on whitespace 2007-06-07 00:04:01 -07:00
builtin-show-branch.c
builtin-show-ref.c
builtin-stripspace.c Even more missing static 2007-06-08 02:54:57 -07:00
builtin-symbolic-ref.c
builtin-tar-tree.c
builtin-unpack-objects.c Ensure return value from xread() is always stored into an ssize_t 2007-05-15 21:16:03 -07:00
builtin-update-index.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
builtin-update-ref.c git-update-ref: add --no-deref option for overwriting/detaching ref 2007-05-10 15:24:44 -07:00
builtin-upload-archive.c
builtin-verify-pack.c
builtin-write-tree.c Merge branch 'maint' 2007-04-25 23:31:45 -07:00
builtin.h Even more missing static 2007-06-08 02:54:57 -07:00
cache-tree.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
cache-tree.h
cache.h More static 2007-06-13 02:02:10 -07:00
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c Ensure return value from xread() is always stored into an ssize_t 2007-05-15 21:16:03 -07:00
commit.c More static 2007-06-13 02:02:10 -07:00
commit.h Even more missing static 2007-06-08 02:54:57 -07:00
config.c -Wold-style-definition fix 2007-06-13 02:02:10 -07:00
config.mak.in War on whitespace 2007-06-07 00:04:01 -07:00
configure.ac Eliminate checks of user-specified Tcl/Tk interpreter. 2007-03-31 23:59:47 -07:00
connect.c War on whitespace 2007-06-07 00:04:01 -07:00
convert-objects.c War on whitespace 2007-06-07 00:04:01 -07:00
convert.c Fix mishandling of $Id$ expanded in the repository copy in convert.c 2007-05-26 01:12:43 -07:00
copy.c War on whitespace 2007-06-07 00:04:01 -07:00
COPYING
csum-file.c More static 2007-06-13 02:02:10 -07:00
csum-file.h More static 2007-06-13 02:02:10 -07:00
ctype.c War on whitespace 2007-06-07 00:04:01 -07:00
daemon.c Missing statics. 2007-06-08 02:37:19 -07:00
date.c War on whitespace 2007-06-07 00:04:01 -07:00
decorate.c Fix a copy-n-paste bug in the object decorator code. 2007-04-20 19:16:12 -07:00
decorate.h Add a generic "object decorator" interface, and make object refs use it 2007-04-16 16:51:09 -07:00
delta.h
diff-delta.c diff-delta: use realloc instead of xrealloc 2007-05-31 00:15:18 -07:00
diff-lib.c War on whitespace 2007-06-07 00:04:01 -07:00
diff.c Teach diff to imply --find-copies-harder upon -C -C 2007-06-12 01:00:38 -07:00
diff.h Even more missing static 2007-06-08 02:54:57 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c War on whitespace 2007-06-07 00:04:01 -07:00
diffcore-rename.c diff -M: release the preimage candidate blobs after rename detection. 2007-05-07 15:54:32 -07:00
diffcore.h Make macros to prevent double-inclusion in headers consistent. 2007-04-29 02:05:11 -07:00
dir.c refactor dir_add_name 2007-06-12 23:00:31 -07:00
dir.h rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
dump-cache-tree.c
entry.c War on whitespace 2007-06-07 00:04:01 -07:00
environment.c War on whitespace 2007-06-07 00:04:01 -07:00
exec_cmd.c
exec_cmd.h Make macros to prevent double-inclusion in headers consistent. 2007-04-29 02:05:11 -07:00
fast-import.c Merge branch 'maint' 2007-05-23 22:37:23 -07:00
fetch-pack.c War on whitespace 2007-06-07 00:04:01 -07:00
fetch.c War on whitespace 2007-06-07 00:04:01 -07:00
fetch.h
generate-cmdlist.sh More static 2007-06-13 02:02:10 -07:00
git-add--interactive.perl
git-am.sh More echo "$user_message" fixes. 2007-05-26 00:33:03 -07:00
git-archimport.perl War on whitespace 2007-06-07 00:04:01 -07:00
git-bisect.sh Bisect: simplify "bisect start" logging. 2007-04-16 21:44:40 -07:00
git-checkout.sh Merge branch 'maint' 2007-06-08 02:55:19 -07:00
git-clean.sh Add clean.requireForce option, and add -f option to git-clean to override it 2007-04-23 22:13:50 -07:00
git-clone.sh Merge branch 'ar/clone' 2007-06-08 21:03:04 -07:00
git-commit.sh War on whitespace 2007-06-07 00:04:01 -07:00
git-compat-util.h Merge branch 'maint' 2007-05-16 12:43:05 -07:00
git-cvsexportcommit.perl War on whitespace 2007-06-07 00:04:01 -07:00
git-cvsimport.perl Merge branch 'aw/cvs' 2007-06-12 21:04:52 -07:00
git-cvsserver.perl cvsserver: Make req_Root more critical of its input data 2007-06-08 02:37:18 -07:00
git-fetch.sh Add another verbosity level to git-fetch 2007-05-24 21:37:03 -07:00
git-instaweb.sh
git-lost-found.sh Fix lost-found to show commits only referenced by reflogs 2007-04-05 15:00:03 -07:00
git-ls-remote.sh
git-merge-octopus.sh
git-merge-one-file.sh War on whitespace 2007-06-07 00:04:01 -07:00
git-merge-ours.sh Use diff* with --exit-code in git-am, git-rebase and git-merge-ours 2007-03-24 23:01:36 -07:00
git-merge-resolve.sh
git-merge-stupid.sh
git-merge.sh Merge branch 'ar/mergestat' 2007-05-29 00:38:52 -07:00
git-mergetool.sh git-mergetool: Make default selection of merge-tool more intelligent 2007-06-10 11:17:30 -04:00
git-p4import.py War on whitespace 2007-06-07 00:04:01 -07:00
git-parse-remote.sh Allow fetching references from any namespace 2007-05-12 09:36:06 -07:00
git-pull.sh Add a configuration option to control diffstat after merge 2007-05-24 21:37:08 -07:00
git-quiltimport.sh applymbox & quiltimport: typofix. 2007-04-24 14:27:41 -07:00
git-rebase.sh git-rebase: suggest to use git-add instead of git-update-index 2007-06-02 12:07:44 -07:00
git-relink.perl
git-remote.perl git-remote show: Also shorten non-fast-forward refs in the 'push' listing 2007-06-12 22:26:07 -07:00
git-repack.sh Ensure git-repack -a -d --max-pack-size=N deletes correct packs 2007-05-24 19:45:14 -07:00
git-request-pull.sh Improve request-pull to handle non-rebased branches 2007-05-03 23:27:03 -07:00
git-reset.sh add file checkout progress 2007-04-23 21:39:28 -07:00
git-send-email.perl Unquote From line from patch before comparing with given from address. 2007-06-12 00:13:49 -07:00
git-sh-setup.sh
git-submodule.sh git-submodule: clone during update, not during init 2007-06-06 02:49:08 -07:00
git-svn.perl git-svn: allow dcommit to retain local merge information 2007-06-13 11:24:23 -07:00
git-svnimport.perl War on whitespace 2007-06-07 00:04:01 -07:00
git-tag.sh War on whitespace 2007-06-07 00:04:01 -07:00
git-verify-tag.sh War on whitespace 2007-06-07 00:04:01 -07:00
GIT-VERSION-GEN Merge branch 'maint' 2007-06-12 00:15:16 -07:00
git.c Merge branch 'maint-1.5.1' into maint 2007-05-20 19:57:00 -07:00
git.spec.in War on whitespace 2007-06-07 00:04:01 -07:00
gitk War on whitespace 2007-06-07 00:04:01 -07:00
grep.c Move buffer_is_binary() to xdiff-interface.h 2007-06-04 23:07:00 -07:00
grep.h
hash-object.c
help.c War on whitespace 2007-06-07 00:04:01 -07:00
http-fetch.c War on whitespace 2007-06-07 00:04:01 -07:00
http-push.c War on whitespace 2007-06-07 00:04:01 -07:00
http.c War on whitespace 2007-06-07 00:04:01 -07:00
http.h http-fetch: Disable use of curl multi support for libcurl < 7.16. 2007-05-03 22:12:40 -07:00
ident.c $EMAIL is a last resort fallback, as it's system-wide. 2007-06-06 00:31:40 -07:00
imap-send.c War on whitespace 2007-06-07 00:04:01 -07:00
index-pack.c Unify write_index_file functions 2007-06-02 13:14:18 -07:00
INSTALL War on whitespace 2007-06-07 00:04:01 -07:00
interpolate.c
interpolate.h
list-objects.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
list-objects.h
local-fetch.c War on whitespace 2007-06-07 00:04:01 -07:00
lockfile.c War on whitespace 2007-06-07 00:04:01 -07:00
log-tree.c Merge branch 'maint' 2007-05-06 00:21:03 -07:00
log-tree.h
mailmap.c War on whitespace 2007-06-07 00:04:01 -07:00
mailmap.h Split out mailmap handling out of shortlog 2007-04-29 02:05:06 -07:00
Makefile Makefile: allow generating git.o for debugging purposes 2007-06-13 02:02:10 -07:00
match-trees.c War on whitespace 2007-06-07 00:04:01 -07:00
merge-file.c
merge-index.c War on whitespace 2007-06-07 00:04:01 -07:00
merge-recursive.c -Wold-style-definition fix 2007-06-13 02:02:10 -07:00
merge-tree.c Remove "pathlen" from "struct name_entry" 2007-03-21 10:21:56 -07:00
mktag.c Remove unnecessary code and comments on non-existing 8kB tag object restriction 2007-06-09 10:51:46 -07:00
mktree.c
object-refs.c War on whitespace 2007-06-07 00:04:01 -07:00
object.c Don't assume tree entries that are not dirs are blobs 2007-06-06 15:43:18 -07:00
object.h War on whitespace 2007-06-07 00:04:01 -07:00
pack-check.c pack-check: Sort entries by pack offset before unpacking them. 2007-06-06 16:04:02 -07:00
pack-redundant.c War on whitespace 2007-06-07 00:04:01 -07:00
pack-write.c Unify write_index_file functions 2007-06-02 13:14:18 -07:00
pack.h Unify write_index_file functions 2007-06-02 13:14:18 -07:00
pager.c
patch-delta.c
patch-id.c War on whitespace 2007-06-07 00:04:01 -07:00
patch-ids.c Refactor patch-id filtering out of git-cherry and git-format-patch. 2007-04-11 20:02:03 -07:00
patch-ids.h Refactor patch-id filtering out of git-cherry and git-format-patch. 2007-04-11 20:02:03 -07:00
path-list.c War on whitespace 2007-06-07 00:04:01 -07:00
path-list.h Make macros to prevent double-inclusion in headers consistent. 2007-04-29 02:05:11 -07:00
path.c
peek-remote.c connect: display connection progress 2007-05-16 12:48:18 -07:00
pkt-line.c War on whitespace 2007-06-07 00:04:01 -07:00
pkt-line.h
progress.c Fix the progress code to output LF only when it is really needed 2007-05-23 11:30:49 -07:00
progress.h Fix the progress code to output LF only when it is really needed 2007-05-23 11:30:49 -07:00
quote.c Even more missing static 2007-06-08 02:54:57 -07:00
quote.h Even more missing static 2007-06-08 02:54:57 -07:00
reachable.c Initialize tree descriptors with a helper function rather than by hand. 2007-03-21 10:21:57 -07:00
reachable.h
read-cache.c War on whitespace 2007-06-07 00:04:01 -07:00
README Update README to point at a few key periodical messages to the list 2007-03-25 17:42:32 -07:00
receive-pack.c git-update-ref: add --no-deref option for overwriting/detaching ref 2007-05-10 15:24:44 -07:00
reflog-walk.c
reflog-walk.h
refs.c More static 2007-06-13 02:02:10 -07:00
refs.h git-update-ref: add --no-deref option for overwriting/detaching ref 2007-05-10 15:24:44 -07:00
RelNotes Release Notes: start preparing for 1.5.3 2007-06-02 19:34:54 -07:00
remote.c Don't dereference a strdup-returned NULL 2007-06-12 22:16:29 -07:00
remote.h Add handlers for fetch-side configuration of remotes. 2007-05-20 21:32:56 -07:00
revision.c More missing static 2007-06-08 02:37:19 -07:00
revision.h More missing static 2007-06-08 02:37:19 -07:00
rsh.c
rsh.h War on whitespace 2007-06-07 00:04:01 -07:00
run-command.c Allow environment variables to be unset in the processes started by run_command 2007-05-23 22:38:44 -07:00
run-command.h Allow environment variables to be unset in the processes started by run_command 2007-05-23 22:38:44 -07:00
send-pack.c Move refspec pattern matching to match_refs(). 2007-05-26 01:20:10 -07:00
server-info.c
setup.c War on whitespace 2007-06-07 00:04:01 -07:00
sha1_file.c More static 2007-06-13 02:02:10 -07:00
sha1_name.c Active_nr is unsigned, hence can't be < 0 2007-06-08 02:37:18 -07:00
shallow.c War on whitespace 2007-06-07 00:04:01 -07:00
shell.c
show-index.c show-index.c: learn about index v2 2007-04-10 12:48:14 -07:00
sideband.c
sideband.h
ssh-fetch.c
ssh-pull.c
ssh-push.c
ssh-upload.c War on whitespace 2007-06-07 00:04:01 -07:00
strbuf.c War on whitespace 2007-06-07 00:04:01 -07:00
strbuf.h
symlinks.c Add has_symlink_leading_path() function. 2007-05-11 22:11:07 -07:00
tag.c Merge branch 'maint-1.5.1' into maint 2007-05-28 23:54:26 -07:00
tag.h
tar.h
test-chmtime.c
test-date.c
test-delta.c Fix compilation of test-delta 2007-05-01 02:59:08 -07:00
test-genrandom.c simple random data generator for tests 2007-04-11 19:23:32 -07:00
test-match-trees.c A new merge stragety 'subtree'. 2007-04-07 02:29:40 -07:00
test-sha1.c
test-sha1.sh
trace.c
tree-diff.c tree_entry_interesting(): allow it to say "everything is interesting" 2007-03-22 00:36:00 -07:00
tree-walk.c War on whitespace 2007-06-07 00:04:01 -07:00
tree-walk.h Remove stale non-static-inline prototype for tree_entry_extract() 2007-05-13 11:57:00 -07:00
tree.c Merge branch 'sv/objfixes' 2007-06-06 15:43:24 -07:00
tree.h
unpack-file.c
unpack-trees.c Merge branch 'maint-1.5.1' into maint 2007-05-20 19:57:00 -07:00
unpack-trees.h unpack-trees: get rid of *indpos parameter. 2007-04-04 00:19:28 -07:00
update-server-info.c
upload-pack.c Even more missing static 2007-06-08 02:54:57 -07:00
usage.c Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS 2007-03-31 01:11:11 -07:00
utf8.c wcwidth redeclaration 2007-05-07 22:02:40 -07:00
utf8.h
var.c War on whitespace 2007-06-07 00:04:01 -07:00
write_or_die.c
wt-status.c Missing statics. 2007-06-08 02:37:19 -07:00
wt-status.h
xdiff-interface.c War on whitespace 2007-06-07 00:04:01 -07:00
xdiff-interface.h Move buffer_is_binary() to xdiff-interface.h 2007-06-04 23:07:00 -07:00

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

	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/tutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands,
and "man git-commandname" for documentation of each command.
CVS users may also want to read Documentation/cvs-migration.txt.

Many Git online resources are accessible from http://git.or.cz/
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.