kernel/git - git - PowerEL Git System

Go to file

Jonathan Nieder 4c5868f43d merge_trees(): add ancestor label parameter for diff3-style output Commands using the merge_trees() machinery will present conflict hunks in output something like what ‘diff3 -m’ produces if the merge.conflictstyle configuration option is set to diff3. The output lacks the name of the merge base on the \|\|\|\|\|\|\| line of the output, and tools can misparse the conflict hunks without it. Add a new o->ancestor parameter to merge_trees() for use as a label for the ancestor in conflict hunks. If o->ancestor is NULL, the output format is as before. All callers pass NULL for now. If o->ancestor is non-NULL and both branches renamed the base file to the same name, that name is included in the conflict hunk labels. Even if o->ancestor is NULL I think this would be a good change, but this patch only does it in the non-NULL case to ensure the output format does not change where it might matter. Requested-by: Stefan Monnier <monnier@iro.umontreal.ca> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2010-03-20 20:36:11 -07:00
Documentation	Update draft release notes to 1.7.1	2010-03-20 11:42:34 -07:00
block-sha1	…
builtin	checkout --conflict=diff3: add a label for ancestor	2010-03-20 20:36:11 -07:00
compat	Merge branch 'fn/maint-mkdtemp-compat' into maint	2010-03-08 00:36:02 -08:00
contrib	Fix a spelling mistake in a git-p4 console message	2010-03-20 09:18:48 -07:00
git-gui	Merge git://repo.or.cz/git-gui	2010-02-07 15:52:28 -08:00
git_remote_helpers	…
gitk-git	Merge git://git.kernel.org/pub/scm/gitk/gitk	2010-02-05 21:22:59 -08:00
gitweb	Merge branch 'jn/gitweb-config-error-die' into maint	2010-03-04 22:27:12 -08:00
perl	git-svn: support fetch with autocrlf on	2010-03-05 02:57:57 -08:00
ppc	…
t	checkout --conflict=diff3: add a label for ancestor	2010-03-20 20:36:11 -07:00
templates	…
xdiff	xdl_merge(): move file1 and file2 labels to xmparam structure	2010-03-20 20:36:10 -07:00
.gitattributes	…
.gitignore	Makefile: lazily compute header dependencies	2010-01-26 10:08:55 -06:00
.mailmap	…
COPYING	Update COPYING with GPLv2 with new FSF address	2010-01-17 14:29:37 -08:00
GIT-VERSION-GEN	Git 1.7.0.2	2010-03-07 11:07:51 -08:00
INSTALL	…
Makefile	Merge branch 'maint'	2010-03-20 11:29:19 -07:00
README	…
RelNotes	Merge accumulated fixes to prepare for 1.7.0.3	2010-03-08 00:50:37 -08:00
abspath.c	make_absolute_path(): Do not append redundant slash	2010-02-14 13:21:31 -08:00
advice.c	Reword "detached HEAD" notification	2010-01-29 22:11:00 -08:00
advice.h	Reword "detached HEAD" notification	2010-01-29 22:11:00 -08:00
alias.c	…
alloc.c	…
archive-tar.c	…
archive-zip.c	…
archive.c	Merge branch 'jc/conflict-marker-size'	2010-01-20 20:28:51 -08:00
archive.h	…
attr.c	git_attr(): fix function signature	2010-01-16 20:39:59 -08:00
attr.h	git_attr(): fix function signature	2010-01-16 20:39:59 -08:00
base85.c	Merge branch 'maint-1.6.2' into maint-1.6.3	2010-01-18 21:29:47 -08:00
bisect.c	Merge branch 'cc/maint-bisect-paths' into maint-1.6.6	2010-03-07 14:53:35 -08:00
bisect.h	…
blob.c	Replace parse_blob() with an explanatory comment	2010-01-18 17:04:02 -08:00
blob.h	Replace parse_blob() with an explanatory comment	2010-01-18 17:04:02 -08:00
branch.c	branch: warn and refuse to set a branch as a tracking branch of itself.	2010-01-18 17:46:28 -08:00
branch.h	…
builtin.h	Builtin-ify git-notes	2010-02-13 19:36:13 -08:00
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'fl/askpass'	2010-03-20 11:29:35 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	Merge branch 'jc/color-attrs'	2010-03-20 11:29:36 -07:00
color.h	Merge branch 'ml/color-grep'	2010-03-20 11:29:36 -07:00
combine-diff.c	…
command-list.txt	…
commit.c	Merge branch 'maint-1.6.5' into maint	2010-01-29 23:36:13 -08:00
commit.h	Merge branch 'jc/maint-limit-note-output'	2010-01-22 16:08:01 -08:00
config.c	Merge branch 'jc/ident'	2010-01-20 14:39:52 -08:00
config.mak.in	Make NO_PTHREADS the sole thread configuration variable	2010-01-31 11:50:50 -08:00
configure.ac	Merge branch 'bw/no-python-autoconf'	2010-02-02 21:48:13 -08:00
connect.c	Merge branch 'fl/askpass'	2010-03-20 11:29:35 -07:00
convert.c	Merge branch 'sp/maint-push-sideband' into maint	2010-03-02 22:54:50 -08:00
copy.c	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	daemon: parse_host_and_port SIGSEGV if port is specified	2010-03-20 08:49:31 -07:00
date.c	Merge branch 'jc/maint-reflog-bad-timestamp'	2010-01-27 14:57:37 -08:00
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	Merge branch 'jl/diff-submodule-ignore'	2010-01-26 22:53:13 -08:00
diff-no-index.c	…
diff.c	Merge branch 'ld/maint-diff-quiet-w' into maint	2010-03-04 22:26:39 -08:00
diff.h	Merge branch 'jc/fix-tree-walk'	2010-01-24 17:35:58 -08:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	Performance optimization for detection of modified submodules	2010-01-18 17:28:21 -08:00
dir.c	Merge branch 'jk/maint-add-ignored-dir'	2010-03-20 11:29:36 -07:00
dir.h	…
editor.c	…
entry.c	Merge branch 'jc/symbol-static'	2010-01-20 14:37:25 -08:00
environment.c	Refactor list of of repo-local env vars	2010-02-24 16:24:25 -08:00
exec_cmd.c	Print RUNTIME_PREFIX warning only when GIT_TRACE is set	2010-02-23 13:20:15 -08:00
exec_cmd.h	…
fast-import.c	refactor duplicated encode_header in pack-objects and fast-import	2010-02-17 15:30:20 -08:00
fetch-pack.h	…
fixup-builtins	…
fsck.c	…
fsck.h	…
generate-cmdlist.sh	…
git-add--interactive.perl	Merge branch 'jk/maint-add--interactive-delete' into maint	2010-03-08 00:36:00 -08:00
git-am.sh	Merge branch 'sh/am-keep-cr'	2010-03-10 15:32:34 -08:00
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Merge branch 'il/maint-xmallocz' into maint	2010-02-10 13:02:16 -08:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	cvsimport: new -R option: generate .git/cvs-revisions mapping	2010-02-06 11:01:59 -08:00
git-cvsserver.perl	Merge branch 'gp/maint-cvsserver'	2010-01-28 00:46:33 -08:00
git-difftool--helper.sh	Make difftool.prompt fall back to mergetool.prompt	2010-01-22 15:57:45 -08:00
git-difftool.perl	difftool: Add '-x' and as an alias for '--extcmd'	2010-01-15 15:04:31 -08:00
git-filter-branch.sh	Merge branch 'maint'	2010-02-11 23:06:32 -08:00
git-instaweb.sh	fix portability issues with $ in double quotes	2010-01-26 15:16:54 -08:00
git-lost-found.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	add shebang line to git-mergetool--lib.sh	2010-01-29 09:56:51 -08:00
git-mergetool.sh	…
git-parse-remote.sh	Do not install shell libraries executable	2010-01-31 11:53:10 -08:00
git-pull.sh	Merge branch 'maint'	2010-03-20 11:29:19 -07:00
git-quiltimport.sh	…
git-rebase--interactive.sh	work around an obnoxious bash "safety feature" on OpenBSD	2010-01-26 19:16:02 -08:00
git-rebase.sh	rebase: don't invoke the pager for each commit summary	2010-01-30 08:42:42 -08:00
git-relink.perl	…
git-repack.sh	…
git-request-pull.sh	request-pull: avoid mentioning that the start point is a single commit	2010-01-29 22:26:39 -08:00
git-send-email.perl	send-email: add --no-cc, --no-to, and --no-bcc	2010-03-08 15:55:42 -08:00
git-sh-setup.sh	Merge branch 'gb/maint-submodule-env' into maint	2010-03-08 00:36:02 -08:00
git-stash.sh	stash: suggest the correct command line for unknown options.	2010-03-06 20:00:42 -08:00
git-submodule.sh	Merge branch 'gb/maint-submodule-env'	2010-03-07 12:47:17 -08:00
git-svn.perl	Merge branch 'fl/askpass'	2010-03-20 11:29:35 -07:00
git-web--browse.sh	…
git.c	Merge branch 'jh/notes'	2010-03-15 00:52:06 -07:00
git.spec.in	RPM packaging: use %global inside %{!?...}	2010-01-31 11:33:44 -08:00
graph.c	Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*	2010-03-07 11:09:02 -08:00
graph.h	…
grep.c	Merge branch 'ml/color-grep'	2010-03-20 11:29:36 -07:00
grep.h	Merge branch 'ml/color-grep'	2010-03-20 11:29:36 -07:00
hash.c	…
hash.h	…
help.c	Remove hyphen from "git-command" in two error messages	2010-02-15 18:20:54 -08:00
help.h	…
hex.c	slim down "git show-index"	2010-01-21 20:03:45 -08:00
http-backend.c	…
http-fetch.c	http: init and cleanup separately from http-walker	2010-03-02 11:10:36 -08:00
http-push.c	http-push: remove "\|\| 1" to enable verbose check	2010-03-02 11:10:36 -08:00
http-walker.c	http: init and cleanup separately from http-walker	2010-03-02 11:10:36 -08:00
http.c	git-core: Support retrieving passwords with GIT_ASKPASS	2010-03-04 22:05:13 -08:00
http.h	…
ident.c	ident.c: replace fprintf with fputs to suppress compiler warning	2010-01-19 15:25:38 -08:00
imap-send.c	Merge branch 'fl/askpass'	2010-03-20 11:29:35 -07:00
levenshtein.c	…
levenshtein.h	Typofixes outside documentation area	2010-02-03 21:28:17 -08:00
list-objects.c	…
list-objects.h	…
ll-merge.c	ll_merge(): add ancestor label parameter for diff3-style output	2010-03-20 20:36:11 -07:00
ll-merge.h	ll_merge(): add ancestor label parameter for diff3-style output	2010-03-20 20:36:11 -07:00
lockfile.c	…
log-tree.c	Fix "log" family not to be too agressive about showing notes	2010-01-20 19:57:02 -08:00
log-tree.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	Make "subtree" part more orthogonal to the rest of merge-recursive.	2010-01-17 22:46:28 -08:00
merge-file.c	merge_file(): add comment explaining behavior wrt conflict style	2010-03-20 20:36:11 -07:00
merge-recursive.c	merge_trees(): add ancestor label parameter for diff3-style output	2010-03-20 20:36:11 -07:00
merge-recursive.h	merge_trees(): add ancestor label parameter for diff3-style output	2010-03-20 20:36:11 -07:00
name-hash.c	…
notes.c	notes.c: remove inappropriate call to return	2010-03-20 07:27:55 -07:00
notes.h	Notes API: prune_notes(): Prune notes that belong to non-existing objects	2010-02-13 19:36:14 -08:00
object.c	object.c: remove unused functions	2010-01-17 22:49:36 -08:00
object.h	object.c: remove unused functions	2010-01-17 22:49:36 -08:00
pack-check.c	…
pack-refs.c	…
pack-refs.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	move encode_in_pack_object_header() to a better place	2010-02-23 13:10:56 -08:00
pack.h	move encode_in_pack_object_header() to a better place	2010-02-23 13:10:56 -08:00
pager.c	Make 'git var GIT_PAGER' always print the configured pager	2010-02-14 18:23:17 -08:00
parse-options.c	Add an optional argument for --color options	2010-02-18 17:21:40 -08:00
parse-options.h	Add an optional argument for --color options	2010-02-18 17:21:40 -08:00
patch-delta.c	Fix integer overflow in patch_delta()	2010-01-26 12:57:59 -08:00
patch-ids.c	…
patch-ids.h	…
path.c	Merge branch 'mm/mkstemps-mode-for-packfiles' into maint	2010-03-08 00:36:00 -08:00
pkt-line.c	…
pkt-line.h	…
preload-index.c	Make ce_uptodate() trustworthy again	2010-01-24 00:15:29 -08:00
pretty.c	Notes API: Allow multiple concurrent notes trees with new struct notes_tree	2010-02-13 19:36:12 -08:00
progress.c	…
progress.h	…
quote.c	Fix invalid read in quote_c_style_counted	2010-02-06 10:55:03 -08:00
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	Correct spelling of 'REUC' extension	2010-02-02 09:54:34 -08:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	for_each_recent_reflog_ent(): use strbuf, fix offset handling	2010-03-13 13:18:09 -08:00
refs.h	rev-parse --branches/--tags/--remotes=pattern	2010-01-20 12:30:25 -08:00
remote-curl.c	Merge branch 'tc/http-cleanup'	2010-03-15 00:58:50 -07:00
remote.c	…
remote.h	…
replace_object.c	…
rerere.c	ll_merge(): add ancestor label parameter for diff3-style output	2010-03-20 20:36:11 -07:00
rerere.h	Merge branch 'jc/cache-unmerge'	2010-01-20 14:46:35 -08:00
resolve-undo.c	build: make code "-Wpointer-arith" clean	2010-02-01 22:04:03 -08:00
resolve-undo.h	build: make code "-Wpointer-arith" clean	2010-02-01 22:04:03 -08:00
revision.c	don't use default revision if a rev was specified	2010-03-13 21:23:43 -08:00
revision.h	Fix "log" family not to be too agressive about showing notes	2010-01-20 19:57:02 -08:00
run-command.c	Merge branch 'mw/maint-gcc-warns-unused-write' into maint	2010-03-08 00:36:02 -08:00
run-command.h	Merge branch 'sp/maint-push-sideband' into maint	2010-03-02 22:54:50 -08:00
send-pack.h	git-push: make git push --porcelain print "Done"	2010-02-28 10:39:30 -08:00
server-info.c	…
setup.c	Merge branch 'nd/root-git'	2010-03-07 12:47:15 -08:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	Merge branch 'mm/mkstemps-mode-for-packfiles' into maint	2010-03-08 00:36:00 -08:00
sha1_name.c	sha1_name: fix segfault caused by invalid index access	2010-02-28 10:32:06 -08:00
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	slim down "git show-index"	2010-01-21 20:03:45 -08:00
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
strbuf.c	Merge branch 'ap/merge-backend-opts'	2010-01-20 20:28:50 -08:00
strbuf.h	Merge branch 'jc/maint-strbuf-add-fix-doubling'	2010-01-20 14:43:09 -08:00
string-list.c	…
string-list.h	…
submodule.c	is_submodule_modified(): clear environment properly	2010-02-24 16:24:25 -08:00
submodule.h	Teach diff --submodule that modified submodule directory is dirty	2010-01-24 21:04:31 -08:00
symlinks.c	symlinks.c: remove unused functions	2010-01-17 22:49:36 -08:00
tag.c	…
tag.h	…
tar.h	…
test-chmtime.c	Typofixes outside documentation area	2010-02-03 21:28:17 -08:00
test-ctype.c	…
test-date.c	…
test-delta.c	…
test-dump-cache-tree.c	…
test-genrandom.c	…
test-index-version.c	…
test-match-trees.c	…
test-parse-options.c	…
test-path-utils.c	…
test-run-command.c	…
test-sha1.c	…
test-sha1.sh	…
test-sigchain.c	…
thread-utils.c	…
thread-utils.h	…
trace.c	…
transport-helper.c	Merge branch 'tc/transport-verbosity'	2010-03-15 00:58:42 -07:00
transport.c	Merge branch 'tc/transport-verbosity'	2010-03-15 00:58:42 -07:00
transport.h	Merge branch 'tc/transport-verbosity'	2010-03-15 00:58:42 -07:00
tree-diff.c	Performance optimization for detection of modified submodules	2010-01-18 17:28:21 -08:00
tree-walk.c	Merge branch 'maint-1.6.6' into maint	2010-02-14 18:59:14 -08:00
tree-walk.h	…
tree.c	…
tree.h	…
unimplemented.sh	…
unpack-trees.c	Merge branch 'jc/fix-tree-walk'	2010-01-24 17:35:58 -08:00
unpack-trees.h	Merge branch 'jc/fix-tree-walk'	2010-01-24 17:35:58 -08:00
upload-pack.c	run-command: support custom fd-set in async	2010-02-05 20:57:22 -08:00
usage.c	…
userdiff.c	git_attr(): fix function signature	2010-01-16 20:39:59 -08:00
userdiff.h	…
utf8.c	Merge branch 'rs/optim-text-wrap' into maint	2010-03-04 22:26:33 -08:00
utf8.h	Merge branch 'rs/optim-text-wrap' into maint	2010-03-04 22:26:33 -08:00
walker.c	…
walker.h	http: init and cleanup separately from http-walker	2010-03-02 11:10:36 -08:00
wrap-for-bin.sh	wrap-for-bin: do not export an empty GIT_TEMPLATE_DIR	2010-03-02 16:27:03 -08:00
wrapper.c	Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later.	2010-02-22 15:24:46 -08:00
write_or_die.c	…
ws.c	git_attr(): fix function signature	2010-01-16 20:39:59 -08:00
wt-status.c	Merge branch 'jl/submodule-diff'	2010-01-22 16:08:10 -08:00
wt-status.h	…
xdiff-interface.c	refactor duplicated fill_mm() in checkout and merge-recursive	2010-02-17 15:11:33 -08:00
xdiff-interface.h	refactor duplicated fill_mm() in checkout and merge-recursive	2010-02-17 15:11:33 -08:00

README

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

	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.