development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-29 04:53:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
No description
13390 commits 6 branches 956 tags 485 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
Find a file
Johannes Schindelin f407f14dea xdl_merge(): make XDL_MERGE_ZEALOUS output simpler 
When a merge conflicts, there are often less than three common lines
between two conflicting regions.

Since a conflict takes up as many lines as are conflicting, plus three
lines for the commit markers,  the output will be shorter (and thus,
simpler) in this case, if the common lines will be merged into the
conflicting regions.

This patch merges up to three common lines into the conflicts.

For example, what looked like this before this patch:

	<<<<<<<
	if (a == 1)
	=======
	if (a != 0)
	>>>>>>>
	{
		int i;
	<<<<<<<
		a = 0;
	=======
		a = !a;
	>>>>>>>

will now look like this:

	<<<<<<<
	if (a == 1)
	{
		int i;
		a = 0;
	=======
	if (a != 0)
	{
		int i;
		a = !a;
	>>>>>>>

Suggested Linus (based on ideas by "Voltage Spike" -- if that name is
real, it is mighty cool).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-18 00:08:40 -08:00
arm
compat
contrib Merge branch 'maint' 2008-02-16 00:20:37 -08:00
Documentation Sync with 1.5.4.2 and start 1.5.5 Release Notes 2008-02-17 01:51:46 -08:00
git-gui Merge git://repo.or.cz/git-gui 2008-02-16 17:42:49 -08:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2008-02-16 17:41:38 -08:00
gitweb
mozilla-sha1
perl
ppc
t xdl_merge(): make XDL_MERGE_ZEALOUS output simpler 2008-02-18 00:08:40 -08:00
templates
xdiff xdl_merge(): make XDL_MERGE_ZEALOUS output simpler 2008-02-18 00:08:40 -08:00
.gitattributes
.gitignore
.mailmap Sync with 1.5.4.2 and start 1.5.5 Release Notes 2008-02-17 01:51:46 -08:00
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c
attr.h
base85.c
blob.c
blob.h
builtin-add.c
builtin-annotate.c
builtin-apply.c Merge branch 'sp/safecrlf' 2008-02-16 17:59:20 -08:00
builtin-archive.c
builtin-blame.c Merge branch 'sp/safecrlf' 2008-02-16 17:59:20 -08:00
builtin-branch.c
builtin-bundle.c
builtin-cat-file.c
builtin-check-attr.c
builtin-check-ref-format.c
builtin-checkout-index.c
builtin-clean.c
builtin-commit-tree.c
builtin-commit.c Merge branch 'pb/prepare-commit-msg' 2008-02-16 17:56:59 -08:00
builtin-config.c Merge branch 'jk/noetcconfig' 2008-02-16 17:56:51 -08:00
builtin-count-objects.c
builtin-describe.c
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c
builtin-diff.c
builtin-fast-export.c
builtin-fetch--tool.c
builtin-fetch-pack.c
builtin-fetch.c
builtin-fmt-merge-msg.c
builtin-for-each-ref.c
builtin-fsck.c
builtin-gc.c
builtin-grep.c
builtin-http-fetch.c
builtin-init-db.c
builtin-log.c
builtin-ls-files.c Merge branch 'jc/gitignore-ends-with-slash' 2008-02-16 17:57:06 -08:00
builtin-ls-remote.c
builtin-ls-tree.c
builtin-mailinfo.c
builtin-mailsplit.c
builtin-merge-base.c
builtin-merge-file.c
builtin-merge-ours.c
builtin-mv.c
builtin-name-rev.c
builtin-pack-objects.c
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c
builtin-push.c
builtin-read-tree.c
builtin-reflog.c
builtin-rerere.c
builtin-reset.c
builtin-rev-list.c
builtin-rev-parse.c
builtin-revert.c
builtin-rm.c
builtin-send-pack.c
builtin-shortlog.c
builtin-show-branch.c
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c
builtin-tag.c
builtin-tar-tree.c
builtin-unpack-objects.c
builtin-update-index.c
builtin-update-ref.c
builtin-upload-archive.c
builtin-verify-pack.c
builtin-verify-tag.c
builtin-write-tree.c
builtin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'sp/safecrlf' 2008-02-16 17:59:20 -08:00
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c
command-list.txt
commit.c
commit.h
config.c Merge branch 'sp/safecrlf' 2008-02-16 17:59:20 -08:00
config.mak.in
configure.ac
connect.c
convert.c Merge branch 'sp/safecrlf' 2008-02-16 17:59:20 -08:00
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff.c Merge branch 'sp/safecrlf' 2008-02-16 17:59:20 -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 'jc/gitignore-ends-with-slash' 2008-02-16 17:57:06 -08:00
dir.h
dump-cache-tree.c
entry.c
environment.c Merge branch 'sp/safecrlf' 2008-02-16 17:59:20 -08:00
exec_cmd.c
exec_cmd.h
fast-import.c Finish current packfile during fast-import crash handler 2008-02-16 00:47:07 -08:00
fetch-pack.h
fixup-builtins
generate-cmdlist.sh
git-add--interactive.perl
git-am.sh
git-archimport.perl
git-bisect.sh
git-checkout.sh
git-clone.sh
git-compat-util.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-filter-branch.sh filter-branch: handle filenames that need quoting 2008-02-15 23:57:26 -08:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-merge-stupid.sh
git-merge.sh
git-mergetool.sh
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--interactive.sh
git-rebase.sh
git-relink.perl
git-remote.perl
git-repack.sh
git-request-pull.sh
git-send-email.perl
git-sh-setup.sh
git-stash.sh
git-submodule.sh
git-svn.perl
GIT-VERSION-GEN Sync with 1.5.4.2 and start 1.5.5 Release Notes 2008-02-17 01:51:46 -08:00
git-web--browse.sh Merge branch 'cc/browser' 2008-02-16 17:57:47 -08:00
git.c
git.spec.in
grep.c
grep.h
hash-object.c
hash.c
hash.h
help.c Merge branch 'cc/browser' 2008-02-16 17:57:47 -08:00
http-push.c
http-walker.c
http.c
http.h
ident.c
imap-send.c
index-pack.c
INSTALL
interpolate.c
interpolate.h
list-objects.c
list-objects.h
lockfile.c
log-tree.c
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'bd/qsort' 2008-02-16 18:11:47 -08:00
match-trees.c
merge-file.c
merge-index.c
merge-recursive.c
merge-tree.c
mktag.c
mktree.c
object-refs.c
object.c
object.h
pack-check.c
pack-redundant.c
pack-write.c
pack.h
pager.c
parse-options.c
parse-options.h
patch-delta.c
patch-id.c
patch-ids.c
patch-ids.h
path-list.c
path-list.h
path.c
pkt-line.c
pkt-line.h
pretty.c
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c
README
receive-pack.c
reflog-walk.c
reflog-walk.h
refs.c
refs.h
RelNotes Sync with 1.5.4.2 and start 1.5.5 Release Notes 2008-02-17 01:51:46 -08:00
remote.c
remote.h
revision.c
revision.h
run-command.c
run-command.h
send-pack.h
server-info.c
setup.c
sha1_file.c
sha1_name.c
shallow.c
shell.c
show-index.c
sideband.c
sideband.h
strbuf.c
strbuf.h
symlinks.c
tag.c
tag.h
tar.h
test-absolute-path.c
test-chmtime.c
test-date.c
test-delta.c
test-genrandom.c
test-match-trees.c
test-parse-options.c
test-sha1.c
test-sha1.sh
trace.c
transport.c
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unpack-file.c
unpack-trees.c Merge branch 'jc/gitignore-ends-with-slash' 2008-02-16 17:57:06 -08:00
unpack-trees.h
update-server-info.c
upload-pack.c
usage.c
utf8.c
utf8.h
var.c
walker.c
walker.h
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/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.