Go to file
Elijah Newren d76ce4f734 log,diff-tree: add --combined-all-paths option
The combined diff format for merges will only list one filename, even if
rename or copy detection is active.  For example, with raw format one
might see:

  ::100644 100644 100644 fabadb8 cc95eb0 4866510 MM	describe.c
  ::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM	bar.sh
  ::100644 100644 100644 e07d6c5 9042e82 ee91881 RR	phooey.c

This doesn't let us know what the original name of bar.sh was in the
first parent, and doesn't let us know what either of the original names
of phooey.c were in either of the parents.  In contrast, for non-merge
commits, raw format does provide original filenames (and a rename score
to boot).  In order to also provide original filenames for merge
commits, add a --combined-all-paths option (which must be used with
either -c or --cc, and is likely only useful with rename or copy
detection active) so that we can print tab-separated filenames when
renames are involved.  This transforms the above output to:

  ::100644 100644 100644 fabadb8 cc95eb0 4866510 MM	desc.c	desc.c	desc.c
  ::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM	foo.sh	bar.sh	bar.sh
  ::100644 100644 100644 e07d6c5 9042e82 ee91881 RR	fooey.c	fuey.c	phooey.c

Further, in patch format, this changes the from/to headers so that
instead of just having one "from" header, we get one for each parent.
For example, instead of having

  --- a/phooey.c
  +++ b/phooey.c

we would see

  --- a/fooey.c
  --- a/fuey.c
  +++ b/phooey.c

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-02-07 20:15:25 -08:00
.github
Documentation log,diff-tree: add --combined-all-paths option 2019-02-07 20:15:25 -08:00
block-sha1
builtin log,diff-tree: add --combined-all-paths option 2019-02-07 20:15:25 -08:00
ci Merge branch 'ab/dynamic-gettext-poison' 2018-11-19 16:24:39 +09:00
compat Merge branch 'rb/hpe' 2019-01-18 13:49:54 -08:00
contrib Merge branch 'bc/tree-walk-oid' 2019-01-29 12:47:56 -08:00
ewah
git-gui
gitk-git
gitweb
mergetools
negotiator
perl
po l10n: de.po: fix two messages 2018-12-07 19:43:07 +01:00
ppc
refs Merge branch 'nd/per-worktree-ref-iteration' 2018-11-26 23:13:43 +09:00
sha1collisiondetection@232357eb2e
sha1dc
sha256 sha256: add an SHA-256 implementation using libgcrypt 2018-11-14 16:54:53 +09:00
t log,diff-tree: add --combined-all-paths option 2019-02-07 20:15:25 -08:00
templates
vcs-svn
xdiff
.clang-format
.editorconfig
.gitattributes Merge branch 'ds/hash-independent-tests-fix' into maint 2018-12-15 12:24:32 +09:00
.gitignore
.gitmodules
.mailmap mailmap: update brandon williams's email address 2018-12-09 10:59:00 +09:00
.travis.yml Merge branch 'ab/dynamic-gettext-poison' 2018-11-19 16:24:39 +09:00
.tsan-suppressions
COPYING
GIT-VERSION-GEN Prepare for 2.21 cycle to start soonish 2018-12-15 12:36:06 +09:00
INSTALL
LGPL-2.1
Makefile Merge branch 'bc/sha-256' 2019-01-29 12:47:55 -08:00
README.md
RelNotes Prepare for 2.21 cycle to start soonish 2018-12-15 12:36:06 +09:00
abspath.c
aclocal.m4
advice.c push: add an advice on unqualified <dst> push 2018-11-14 15:27:55 +09:00
advice.h push: add an advice on unqualified <dst> push 2018-11-14 15:27:55 +09:00
alias.c
alias.h
alloc.c
alloc.h
apply.c Merge branch 'nd/checkout-noisy' 2019-01-14 15:29:29 -08:00
apply.h
archive-tar.c Indent code with TABs 2018-12-09 12:37:32 +09:00
archive-zip.c
archive.c Merge branch 'nd/indentation-fix' 2019-01-14 15:29:32 -08:00
archive.h
argv-array.c
argv-array.h
attr.c Merge branch 'nd/i18n' 2019-01-04 13:33:31 -08:00
attr.h
banned.h banned.h: mark strncat() as banned 2019-01-02 10:19:05 -08:00
base85.c
bisect.c Merge branch 'nd/style-opening-brace' 2019-01-18 13:49:52 -08:00
bisect.h
blame.c
blame.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c Merge branch 'nd/the-index' 2019-01-04 13:33:33 -08:00
bundle.h
cache-tree.c Merge branch 'bc/tree-walk-oid' 2019-01-29 12:47:56 -08:00
cache-tree.h
cache.h Merge branch 'bc/tree-walk-oid' 2019-01-29 12:47:56 -08:00
chdir-notify.c
chdir-notify.h
check-builtins.sh
check-racy.c
check_bindir
checkout.c
checkout.h
color.c
color.h
column.c
column.h
combine-diff.c log,diff-tree: add --combined-all-paths option 2019-02-07 20:15:25 -08:00
command-list.txt Merge branch 'du/cherry-is-plumbing' into maint 2018-11-21 22:58:05 +09:00
commit-graph.c Merge branch 'bc/sha-256' 2019-01-29 12:47:55 -08:00
commit-graph.h Merge branch 'ds/commit-graph-with-grafts' into maint 2018-11-21 22:57:47 +09:00
commit-reach.c
commit-reach.h Merge branch 'ds/add-missing-tags' 2018-11-13 22:37:24 +09:00
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'ds/commit-graph-with-grafts' into maint 2018-11-21 22:57:47 +09:00
commit.h Merge branch 'js/shallow-and-fetch-prune' into maint 2018-11-21 22:57:51 +09:00
common-main.c
config.c index: make index.threads=true enable ieot and eoie 2018-11-21 16:46:54 +09:00
config.h index: make index.threads=true enable ieot and eoie 2018-11-21 16:46:54 +09:00
config.mak.dev Merge branch 'jk/dev-build-format-security' 2019-01-18 13:49:55 -08:00
config.mak.in
config.mak.uname Merge branch 'rb/hpe' 2019-01-18 13:49:54 -08:00
configure.ac Merge branch 'dd/poll-dot-h' 2018-11-19 16:24:41 +09:00
connect.c
connect.h
connected.c
connected.h
convert.c Merge branch 'nd/style-opening-brace' 2019-01-18 13:49:52 -08:00
convert.h
copy.c
credential-cache--daemon.c style: the opening '{' of a function is in a separate line 2018-12-10 15:41:09 +09:00
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta-islands.c tree-walk: store object_id in a separate member 2019-01-15 09:57:41 -08:00
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'jk/save-getenv-result' 2019-01-29 12:47:54 -08:00
diff.h log,diff-tree: add --combined-all-paths option 2019-02-07 20:15:25 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c Merge branch 'tb/log-G-binary' 2019-01-14 15:29:31 -08:00
diffcore-rename.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c dir.c: move, rename and export match_attrs() 2018-11-19 10:50:33 +09:00
dir.h
editor.c
entry.c Merge branch 'nd/checkout-noisy' 2019-01-14 15:29:29 -08:00
environment.c Merge branch 'jk/save-getenv-result' 2019-01-29 12:47:54 -08:00
exec-cmd.c
exec-cmd.h
fast-import.c Merge branch 'en/fast-export-import' 2019-01-04 13:33:33 -08:00
fetch-negotiator.c
fetch-negotiator.h
fetch-object.c
fetch-object.h
fetch-pack.c upload-pack: teach deepen-relative in protocol v2 2019-01-10 14:53:49 -08:00
fetch-pack.h
fmt-merge-msg.h
fsck.c tree-walk: store object_id in a separate member 2019-01-15 09:57:41 -08:00
fsck.h
fsmonitor.c
fsmonitor.h
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'rb/hpe' 2019-01-18 13:49:54 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-legacy-rebase.sh rebase: introduce a shortcut for --reschedule-failed-exec 2018-12-11 17:19:01 +09:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py git-p4: fix problem when p4 login is not necessary 2019-01-07 14:23:22 -08:00
git-parse-remote.sh
git-quiltimport.sh git-quiltimport: add --keep-non-patch option 2019-01-07 15:29:34 -08:00
git-rebase--am.sh
git-rebase--common.sh rebase: introduce --reschedule-failed-exec 2018-12-11 17:19:01 +09:00
git-rebase--merge.sh
git-rebase--preserve-merges.sh
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'nd/complete-format-patch' 2018-11-13 22:37:28 +09:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh stash: tolerate missing user identity 2018-11-19 08:24:34 +09:00
git-submodule.sh Merge branch 'ao/submodule-wo-gitmodules-checked-out' 2018-11-13 22:37:22 +09:00
git-svn.perl
git-web--browse.sh
git.c Merge branch 'nd/style-opening-brace' 2019-01-18 13:49:52 -08:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c Merge branch 'np/log-graph-octopus-fix' into maint 2018-11-21 22:57:49 +09:00
graph.h
grep.c Merge branch 'nd/the-index' 2019-01-04 13:33:33 -08:00
grep.h
hash.h hash: add an SHA-256 implementation using OpenSSL 2018-11-14 16:54:53 +09:00
hashmap.c
hashmap.h
help.c help -a: handle aliases with long names gracefully 2018-12-12 17:18:38 +09:00
help.h help.h: fix coding style 2018-12-12 17:18:29 +09:00
hex.c hex: introduce functions to print arbitrary hashes 2018-11-14 16:54:52 +09:00
http-backend.c Merge branch 'mk/http-backend-kill-children-before-exit' 2019-01-04 13:33:35 -08:00
http-fetch.c
http-push.c tree-walk: store object_id in a separate member 2019-01-15 09:57:41 -08:00
http-walker.c
http.c Merge branch 'ms/http-no-more-failonerror' 2019-01-29 12:47:55 -08:00
http.h http: enable keep_error for HTTP requests 2019-01-10 15:00:56 -08:00
ident.c
imap-send.c style: the opening '{' of a function is in a separate line 2018-12-10 15:41:09 +09:00
interdiff.c
interdiff.h
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c
list-objects-filter-options.h
list-objects-filter.c
list-objects-filter.h
list-objects.c Merge branch 'bc/tree-walk-oid' 2019-01-29 12:47:56 -08:00
list-objects.h
list.h
ll-merge.c Merge branch 'en/merge-path-collision' 2019-01-04 13:33:32 -08:00
ll-merge.h Merge branch 'en/merge-path-collision' 2019-01-04 13:33:32 -08:00
lockfile.c
lockfile.h
log-tree.c log: add %S option (like --source) to log --format 2019-01-11 10:28:11 -08:00
log-tree.h
ls-refs.c upload-pack: support hidden refs with protocol v2 2019-01-10 11:15:37 -08:00
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
match-trees.c tree-walk: store object_id in a separate member 2019-01-15 09:57:41 -08:00
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'nd/attr-pathspec-in-tree-walk' 2019-01-14 15:29:28 -08:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
midx.c Merge branch 'jk/loose-object-cache' 2019-01-04 13:33:32 -08:00
midx.h Merge branch 'ds/test-multi-pack-index' 2018-11-13 22:37:19 +09:00
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c tree-walk: store object_id in a separate member 2019-01-15 09:57:41 -08:00
notes.h
object-store.h object-store: retire odb_load_loose_cache() 2019-01-08 09:40:19 -08:00
object.c object-store: factor out odb_clear_loose_cache() 2019-01-08 09:40:19 -08:00
object.h
oidmap.c
oidmap.h
oidset.c
oidset.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h Merge branch 'nd/the-index' 2019-01-04 13:33:33 -08:00
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c Merge branch 'bc/tree-walk-oid' 2019-01-29 12:47:56 -08:00
packfile.h
pager.c
parse-options-cb.c Merge branch 'nd/i18n' 2019-01-04 13:33:31 -08:00
parse-options.c Merge branch 'nd/indentation-fix' 2019-01-14 15:29:32 -08:00
parse-options.h Merge branch 'nd/indentation-fix' 2019-01-14 15:29:32 -08:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'jk/loose-object-cache' 2019-01-04 13:33:32 -08:00
path.h
pathspec.c dir.c: move, rename and export match_attrs() 2018-11-19 10:50:33 +09:00
pathspec.h dir.c: move, rename and export match_attrs() 2018-11-19 10:50:33 +09:00
pkt-line.c
pkt-line.h
preload-index.c Merge branch 'nd/pthreads' 2018-11-18 18:23:52 +09:00
pretty.c log: add %S option (like --source) to log --format 2019-01-11 10:28:11 -08:00
pretty.h log: add %S option (like --source) to log --format 2019-01-11 10:28:11 -08:00
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
protocol.c
protocol.h
quote.c Indent code with TABs 2018-12-09 12:37:32 +09:00
quote.h
range-diff.c format-patch: do not let its diff-options affect --range-diff 2018-11-30 13:47:55 +09:00
range-diff.h format-patch: do not let its diff-options affect --range-diff 2018-11-30 13:47:55 +09:00
reachable.c
reachable.h
read-cache.c Merge branch 'nd/indentation-fix' 2019-01-14 15:29:32 -08:00
rebase-interactive.c
rebase-interactive.h
ref-filter.c Merge branch 'ot/ref-filter-object-info' 2019-01-18 13:49:56 -08:00
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'ds/commit-graph-with-grafts' into maint 2018-11-21 22:57:47 +09:00
refs.h Merge branch 'ds/commit-graph-with-grafts' into maint 2018-11-21 22:57:47 +09:00
refspec.c
refspec.h
remote-curl.c Merge branch 'ms/http-no-more-failonerror' 2019-01-29 12:47:55 -08:00
remote-testsvn.c
remote.c Merge branch 'jk/remote-insteadof-cleanup' 2019-01-29 12:47:55 -08:00
remote.h
replace-object.c Merge branch 'ds/commit-graph-with-grafts' into maint 2018-11-21 22:57:47 +09:00
replace-object.h
repository.c Merge branch 'sb/submodule-recursive-fetch-gets-the-tip' 2019-01-29 12:47:54 -08:00
repository.h repository: repo_submodule_init to take a submodule struct 2018-12-05 11:42:32 +09:00
rerere.c Merge branch 'en/rerere-multi-stage-1-fix' into maint 2018-11-21 22:57:44 +09:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c log,diff-tree: add --combined-all-paths option 2019-02-07 20:15:25 -08:00
revision.h log,diff-tree: add --combined-all-paths option 2019-02-07 20:15:25 -08:00
run-command.c Merge branch 'jc/run-command-report-exec-failure-fix' into maint 2018-12-15 12:24:34 +09:00
run-command.h
send-pack.c
send-pack.h
sequencer.c Merge branch 'js/rebase-i-redo-exec' 2019-01-29 12:47:53 -08:00
sequencer.h Merge branch 'js/rebase-i-redo-exec' 2019-01-29 12:47:53 -08:00
serve.c
serve.h
server-info.c
setup.c Simplify handling of setup_git_directory_gently() failure cases. 2019-01-03 10:41:39 -08:00
sh-i18n--envsubst.c
sha1-array.c sha1-array: provide oid_array_filter 2018-12-05 11:42:31 +09:00
sha1-array.h sha1-array: provide oid_array_filter 2018-12-05 11:42:31 +09:00
sha1-file.c Merge branch 'bc/sha-256' 2019-01-29 12:47:55 -08:00
sha1-lookup.c
sha1-lookup.h
sha1-name.c object-store: factor out odb_loose_cache() 2019-01-08 09:40:19 -08:00
sha1dc_git.c
sha1dc_git.h
shallow.c fetch-pack: do not take shallow lock unnecessarily 2019-01-10 14:53:35 -08:00
shell.c
shortlog.h
sideband.c sideband: color lines with keyword only 2018-12-04 12:12:46 +09:00
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c style: the opening '{' of a function is in a separate line 2018-12-10 15:41:09 +09:00
string-list.h
sub-process.c
sub-process.h
submodule-config.c Merge branch 'ao/submodule-wo-gitmodules-checked-out' 2018-11-13 22:37:22 +09:00
submodule-config.h
submodule.c Merge branch 'sb/submodule-recursive-fetch-gets-the-tip' 2019-01-29 12:47:54 -08:00
submodule.h submodule: unset core.worktree if no working tree is present 2018-12-26 10:21:02 -08:00
symlinks.c Indent code with TABs 2018-12-09 12:37:32 +09:00
tag.c
tag.h
tar.h
tempfile.c
tempfile.h Merge branch 'jk/reopen-tempfile-truncate' into maint 2018-11-21 22:57:43 +09:00
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trailer.c
trailer.h Merge branch 'jk/trailer-fixes' into maint 2018-11-21 22:57:42 +09:00
transport-helper.c Merge branch 'rb/hpe' 2019-01-18 13:49:54 -08:00
transport-internal.h
transport.c Merge branch 'nd/the-index' 2019-01-04 13:33:33 -08:00
transport.h
tree-diff.c Merge branch 'bc/tree-walk-oid' 2019-01-29 12:47:56 -08:00
tree-walk.c Merge branch 'bc/tree-walk-oid' 2019-01-29 12:47:56 -08:00
tree-walk.h Merge branch 'bc/tree-walk-oid' 2019-01-29 12:47:56 -08:00
tree.c Merge branch 'bc/tree-walk-oid' 2019-01-29 12:47:56 -08:00
tree.h tree.c: make read_tree*() take 'struct repository *' 2018-11-19 10:50:33 +09:00
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'bc/tree-walk-oid' 2019-01-29 12:47:56 -08:00
unpack-trees.h
upload-pack.c upload-pack: teach deepen-relative in protocol v2 2019-01-10 14:53:49 -08:00
upload-pack.h
url.c style: the opening '{' of a function is in a separate line 2018-12-10 15:41:09 +09:00
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c Merge branch 'nd/style-opening-brace' 2019-01-18 13:49:52 -08:00
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c tree-walk: store object_id in a separate member 2019-01-15 09:57:41 -08:00
walker.h
wildmatch.c
wildmatch.h
worktree.c Merge branch 'nd/per-worktree-ref-iteration' 2018-11-13 22:37:26 +09:00
worktree.h Merge branch 'nd/per-worktree-ref-iteration' 2018-11-13 22:37:26 +09:00
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c Merge branch 'nd/the-index' 2019-01-04 13:33:33 -08:00
wt-status.h
xdiff-interface.c Merge branch 'jk/xdiff-interface' 2018-11-13 22:37:27 +09:00
xdiff-interface.h
zlib.c

README.md

Git - fast, scalable, distributed revision control system

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 version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

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

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-.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).

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 (read Documentation/SubmittingPatches for instructions on patch submission). 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 https://public-inbox.org/git/, http://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (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