Go to file
Jonathan Nieder 7ca56aa076 merge-recursive: add a label for ancestor
git merge-recursive (and hence git merge) will present conflict hunks
in output something like what ‘diff3 -m’ produces if the
merge.conflictstyle configuration option is set to diff3.
There is a small difference from diff3: diff3 -m includes a label
for the merge base on the ||||||| line.

Tools familiar with the format and humans unfamiliar with the format
both can benefit from such a label.  So mark the start of the text
from the merge bases with the heading "||||||| merged common
ancestors".

It would be nicer to use a more informative label.  Perhaps someone
will provide one some day.

git rerere does not have trouble parsing the new output, and its
preimage ids are unchanged since it has its own code for re-creating
conflict hunks.  No other code in git parses conflict hunks.

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 cherry-pick, revert: 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
git_remote_helpers
gitk-git
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 cherry-pick, revert: 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
.mailmap
COPYING
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
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c
attr.h
base85.c
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
blob.h
branch.c
branch.h
builtin.h
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
commit.h
config.c
config.mak.in
configure.ac
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
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
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
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c Merge branch 'jk/maint-add-ignored-dir' 2010-03-20 11:29:36 -07:00
dir.h
editor.c
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c
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 compat: add mempcpy() 2010-03-20 20:36:11 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh
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 Merge branch 'maint' 2010-03-20 11:29:19 -07:00
git-quiltimport.sh
git-rebase--interactive.sh
git-rebase.sh
git-relink.perl
git-repack.sh
git-request-pull.sh
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
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
help.h
hex.c
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
imap-send.c Merge branch 'fl/askpass' 2010-03-20 11:29:35 -07:00
levenshtein.c
levenshtein.h
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
log-tree.h
mailmap.c
mailmap.h
match-trees.c
merge-file.c merge_file(): add comment explaining behavior wrt conflict style 2010-03-20 20:36:11 -07:00
merge-recursive.c merge-recursive: add a label for ancestor 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
object.c
object.h
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options.c
parse-options.h
patch-delta.c
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
pretty.c
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c
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
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
resolve-undo.c
resolve-undo.h
revision.c don't use default revision if a rev was specified 2010-03-13 21:23:43 -08:00
revision.h
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
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
string-list.c
string-list.h
submodule.c
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
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
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-trees.c
unpack-trees.h
upload-pack.c
usage.c
userdiff.c
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
write_or_die.c
ws.c
wt-status.c
wt-status.h
xdiff-interface.c
xdiff-interface.h

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.