mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-03 16:22:22 +02:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
9,605 Commits 6 Branches 955 Tags 494 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
8a35981927
Go to file
Alex Riesen 8a35981927 Add a test for merging changed and rename-changed branches 
Also leave a warning for future merge-recursive explorers.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-25 23:43:16 -07:00
arm
compat
contrib Merge branch 'master' of git://repo.or.cz/git/fastimport 2007-04-24 22:02:38 -07:00
Documentation Merge branch 'maint' 2007-04-25 23:31:45 -07:00
git-gui Merge branch 'master' of git://repo.or.cz/git-gui 2007-04-17 17:16:56 -07:00
gitweb gitweb: Show "no difference" message for empty diff 2007-04-22 22:49:25 -07:00
mozilla-sha1
perl perl: install private Error.pm if the site version is older than our own 2007-04-21 13:06:24 -07:00
ppc
t Add a test for merging changed and rename-changed branches 2007-04-25 23:43:16 -07:00
templates Have sample update hook not refuse deleting a branch through push. 2007-04-16 01:35:39 -07:00
xdiff xdiff/xutils.c(xdl_hash_record): factor out whitespace handling 2007-03-19 22:17:25 -07:00
.gitignore Merge branch 'jc/attr' 2007-04-21 17:38:00 -07:00
.mailmap
alloc.c Clean up object creation to use more common code 2007-04-16 23:36:16 -07:00
archive-tar.c convert object type handling from a string to a number 2007-02-27 01:34:21 -08:00
archive-zip.c convert object type handling from a string to a number 2007-02-27 01:34:21 -08: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 (encode_85, decode_85): Mark source buffer pointer as "const". 2007-04-11 00:51:20 -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 -u: match the index with working tree. 2007-04-20 01:47:47 -07:00
builtin-annotate.c
builtin-apply.c Merge branch 'jc/attr' 2007-04-21 17:38:00 -07:00
builtin-archive.c git-archive: make tar the default format 2007-04-09 18:51:40 -07:00
builtin-blame.c Update git-annotate/git-blame documentation 2007-04-16 01:14:46 -07:00
builtin-branch.c Make builtin-branch.c handle the git config file 2007-04-06 16:54:39 -07:00
builtin-bundle.c Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS 2007-03-31 01:11:11 -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 get rid of num_packed_objects() 2007-04-10 12:48:14 -07:00
builtin-describe.c
builtin-diff-files.c Allow git-diff exit with codes similar to diff(1) 2007-03-14 16:21:19 -07:00
builtin-diff-index.c Allow git-diff exit with codes similar to diff(1) 2007-03-14 16:21:19 -07:00
builtin-diff-tree.c Allow git-diff exit with codes similar to diff(1) 2007-03-14 16:21:19 -07:00
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 git-fetch: Fix "argument list too long" 2007-04-24 00:08:01 -07:00
builtin-fmt-merge-msg.c Merge branch 'maint' 2007-02-27 22:15:42 -08:00
builtin-for-each-ref.c General const correctness fixes 2007-03-07 10:47:10 -08:00
builtin-fsck.c Merge branch 'lt/gitlink' 2007-04-21 17:21:10 -07:00
builtin-gc.c Make gc a builtin. 2007-03-17 00:34:19 -07:00
builtin-grep.c sscanf/strtoul: parse integers robustly 2007-04-14 19:47:20 -07:00
builtin-init-db.c
builtin-log.c Add support for "commit name decorations" to log family of commands 2007-04-16 16:51:11 -07:00
builtin-ls-files.c Fix some "git ls-files -o" fallout from gitlinks 2007-04-14 17:42:58 -07:00
builtin-ls-tree.c Teach core object handling functions about gitlinks 2007-04-10 13:50:43 -07:00
builtin-mailinfo.c git-mailinfo fixes for patch munging 2007-03-31 00:59:19 -07:00
builtin-mailsplit.c
builtin-merge-base.c
builtin-merge-file.c
builtin-mv.c Merge branch 'jc/index-output' 2007-04-07 02:26:24 -07:00
builtin-name-rev.c
builtin-pack-objects.c make progress "title" part of the common progress interface 2007-04-22 22:18:05 -07:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c minor git-prune optimization 2007-03-20 22:17:47 -07:00
builtin-push.c git-push to multiple locations does not stop at the first failure 2007-04-07 02:27:31 -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 Initialize tree descriptors with a helper function rather than by hand. 2007-03-21 10:21:57 -07:00
builtin-rerere.c rerere: make sorting really stable. 2007-04-04 14:12:03 -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 git-revert: Revert revert message to old behaviour 2007-03-24 02:50:22 -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 shortlog -w: make wrap-line behaviour optional. 2007-04-10 12:48:35 -07:00
builtin-show-branch.c General const correctness fixes 2007-03-07 10:47:10 -08:00
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c
builtin-tar-tree.c
builtin-unpack-objects.c make progress "title" part of the common progress interface 2007-04-22 22:18:05 -07:00
builtin-update-index.c Merge branch 'lt/gitlink' 2007-04-21 17:21:10 -07:00
builtin-update-ref.c
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 Add basic infrastructure to assign attributes to paths 2007-04-14 08:57:06 -07:00
cache-tree.c Teach core object handling functions about gitlinks 2007-04-10 13:50:43 -07:00
cache-tree.h
cache.h Add --date={local,relative,default} 2007-04-25 21:39:43 -07:00
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c Support 'diff=pgm' attribute 2007-04-22 22:16:14 -07:00
commit.c Add --date={local,relative,default} 2007-04-25 21:39:43 -07:00
commit.h Add --date={local,relative,default} 2007-04-25 21:39:43 -07:00
config.c Fix renaming branch without config file 2007-04-05 14:53:22 -07:00
config.mak.in Add --with-tcltk and --without-tcltk to configure. 2007-03-31 23:59:47 -07:00
configure.ac Eliminate checks of user-specified Tcl/Tk interpreter. 2007-03-31 23:59:47 -07:00
connect.c Fix "getaddrinfo()" buglet 2007-03-27 13:00:13 -07:00
convert-objects.c fix up strtoul_ui error handling 2007-04-18 19:26:33 -07:00
convert.c Fix a typo in crlf conversion code 2007-04-22 10:44:38 -07:00
copy.c
COPYING
csum-file.c compute a CRC32 for each object as stored in a pack 2007-04-10 12:48:14 -07:00
csum-file.h compute a CRC32 for each object as stored in a pack 2007-04-10 12:48:14 -07:00
ctype.c
daemon.c
date.c Add --date={local,relative,default} 2007-04-25 21:39:43 -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-lib.c Merge branch 'lt/gitlink' 2007-04-21 17:21:10 -07:00
diff.c Support 'diff=pgm' attribute 2007-04-22 22:16:14 -07:00
diff.h Support 'diff=pgm' attribute 2007-04-22 22:16:14 -07:00
diffcore-break.c Cast 64 bit off_t to 32 bit size_t 2007-03-07 11:15:26 -08:00
diffcore-delta.c
diffcore-order.c Cast 64 bit off_t to 32 bit size_t 2007-03-07 11:15:26 -08:00
diffcore-pickaxe.c
diffcore-rename.c Cast 64 bit off_t to 32 bit size_t 2007-03-07 11:15:26 -08:00
diffcore.h
dir.c Merge branch 'maint' 2007-04-24 00:08:16 -07:00
dir.h Teach directory traversal about subprojects 2007-04-11 19:09:55 -07:00
dump-cache-tree.c
entry.c entry.c: Use const qualifier for 'struct checkout' parameters 2007-04-25 13:15:59 -07:00
environment.c Limit the size of the new delta_base_cache 2007-03-18 22:43:37 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c fast-import: size_t vs ssize_t 2007-04-24 16:14:48 -04:00
fetch-pack.c Merge branch 'js/fetch-progress' (early part) 2007-03-04 17:31:21 -08:00
fetch.c Initialize tree descriptors with a helper function rather than by hand. 2007-03-21 10:21:57 -07:00
fetch.h
generate-cmdlist.sh
git-add--interactive.perl
git-am.sh Fix typo in git-am: s/Was is/Was it/ 2007-04-23 22:14:24 -07:00
git-applymbox.sh applymbox & quiltimport: typofix. 2007-04-24 14:27:41 -07:00
git-applypatch.sh
git-archimport.perl git-archimport: allow remapping branch names 2007-03-07 10:30:22 -08:00
git-bisect.sh Bisect: simplify "bisect start" logging. 2007-04-16 21:44:40 -07:00
git-checkout.sh add file checkout progress 2007-04-23 21:39:28 -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 git-clone: fix dumb protocol transport to clone from pack-pruned ref 2007-04-20 17:25:27 -07:00
git-commit.sh Display the subject of the commit just made. 2007-04-16 01:06:00 -07:00
git-compat-util.h Merge branch 'maint' 2007-04-25 23:31:45 -07:00
git-cvsexportcommit.perl cvsexportcommit -p : fix the usage of git-apply -C. 2007-04-09 18:52:41 -07:00
git-cvsimport.perl cvsimport: Improve usage error reporting 2007-04-06 16:46:11 -07:00
git-cvsserver.perl Merge branch 'fl/cvsserver' 2007-04-17 22:17:46 -07:00
git-fetch.sh git-fetch: Fix "argument list too long" 2007-04-24 00:08:01 -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
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 A new merge stragety 'subtree'. 2007-04-07 02:29:40 -07:00
git-mergetool.sh mergetool: Clean up description of files and prompts for merge resolutions 2007-03-29 22:46:16 -04:00
git-p4import.py
git-parse-remote.sh git-fetch, git-branch: Support local --track via a special remote '.' 2007-03-16 02:10:12 -07:00
git-pull.sh
git-quiltimport.sh applymbox & quiltimport: typofix. 2007-04-24 14:27:41 -07:00
git-rebase.sh Use rev-list --reverse in git-rebase.sh 2007-04-13 19:06:40 -07:00
git-relink.perl
git-remote.perl Teach git-remote to list pushed branches. 2007-03-20 01:54:49 -07:00
git-repack.sh
git-request-pull.sh
git-reset.sh add file checkout progress 2007-04-23 21:39:28 -07:00
git-send-email.perl Merge branch 'maint' 2007-04-25 23:31:45 -07:00
git-sh-setup.sh
git-svn.perl git-svn: Ignore usernames in URLs in find_by_url 2007-04-25 23:05:44 -07:00
git-svnimport.perl
git-tag.sh
git-verify-tag.sh
GIT-VERSION-GEN GIT 1.5.1.2 2007-04-21 13:57:07 -07:00
git.c Add basic infrastructure to assign attributes to paths 2007-04-14 08:57:06 -07:00
git.spec.in Merge branch 'maint' 2007-04-24 00:08:16 -07:00
gitk [PATCH] Improve look-and-feel of the gitk tool. 2007-04-01 12:47:06 +10:00
grep.c
grep.h
hash-object.c index_fd(): pass optional path parameter as hint for blob conversion 2007-02-28 12:00:00 -08:00
help.c use xrealloc in help.c 2007-03-27 16:57:57 -07:00
http-fetch.c Fix lseek(2) calls with args 2 and 3 swapped 2007-04-05 15:39:12 -07:00
http-push.c Fix lseek(2) calls with args 2 and 3 swapped 2007-04-05 15:39:12 -07:00
http.c
http.h
ident.c ident.c: Use size_t (instead of int) to store sizes 2007-04-15 15:59:09 -07:00
imap-send.c
index-pack.c make progress "title" part of the common progress interface 2007-04-22 22:18:05 -07:00
INSTALL
interpolate.c General const correctness fixes 2007-03-07 10:47:10 -08:00
interpolate.h General const correctness fixes 2007-03-07 10:47:10 -08:00
list-objects.c Teach git list-objects logic to not follow gitlinks 2007-04-14 03:14:14 -07:00
list-objects.h
local-fetch.c [PATCH] local-fetch.c: some error printing cleanup 2007-03-16 21:27:35 -07:00
lockfile.c lockfile: record the primary process. 2007-04-21 11:55:23 -07:00
log-tree.c Add --date={local,relative,default} 2007-04-25 21:39:43 -07:00
log-tree.h
Makefile Merge branch 'maint' 2007-04-24 22:07:34 -07:00
match-trees.c A new merge stragety 'subtree'. 2007-04-07 02:29:40 -07:00
merge-file.c convert object type handling from a string to a number 2007-02-27 01:34:21 -08:00
merge-index.c Fix merge-index 2007-03-19 02:48:37 -07:00
merge-recursive.c Add a test for merging changed and rename-changed branches 2007-04-25 23:43:16 -07:00
merge-tree.c Remove "pathlen" from "struct name_entry" 2007-03-21 10:21:56 -07:00
mktag.c convert object type handling from a string to a number 2007-02-27 01:34:21 -08:00
mktree.c convert object type handling from a string to a number 2007-02-27 01:34:21 -08:00
object-refs.c Add a generic "object decorator" interface, and make object refs use it 2007-04-16 16:51:09 -07:00
object.c add add_object_array_with_mode 2007-04-24 00:08:49 -07:00
object.h add add_object_array_with_mode 2007-04-24 00:08:49 -07:00
pack-check.c get rid of num_packed_objects() 2007-04-10 12:48:14 -07:00
pack-redundant.c pack-redundant.c: learn about index v2 2007-04-10 12:48:14 -07:00
pack.h [PATCH] clean up pack index handling a bit 2007-03-16 21:27:36 -07:00
pager.c
patch-delta.c
patch-id.c
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
path-list.h
path.c General const correctness fixes 2007-03-07 10:47:10 -08:00
peek-remote.c
pkt-line.c
pkt-line.h
progress.c provide a facility for "delayed" progress reporting 2007-04-22 22:18:05 -07:00
progress.h provide a facility for "delayed" progress reporting 2007-04-22 22:18:05 -07:00
quote.c
quote.h
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 read_cache_from(): small simplification 2007-04-25 13:44:27 -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 Use run_command within receive-pack to invoke index-pack 2007-03-12 23:40:18 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'lt/gitlink' 2007-04-21 17:21:10 -07:00
refs.h Add 'resolve_gitlink_ref()' helper function 2007-04-10 13:44:16 -07:00
RelNotes Start preparing for 1.5.1.3 2007-04-25 23:27:07 -07:00
revision.c Add --date={local,relative,default} 2007-04-25 21:39:43 -07:00
revision.h Add --date={local,relative,default} 2007-04-25 21:39:43 -07:00
rsh.c
rsh.h
run-command.c Teach run-command to redirect stdout to /dev/null 2007-03-12 23:40:17 -07:00
run-command.h Teach run-command to redirect stdout to /dev/null 2007-03-12 23:40:17 -07:00
send-pack.c Use run_command within send-pack 2007-03-12 23:40:18 -07:00
server-info.c
setup.c Merge branch 'maint' 2007-03-10 22:07:26 -08:00
sha1_file.c Merge branch 'maint' 2007-04-25 23:31:45 -07:00
sha1_name.c add get_sha1_with_mode 2007-04-24 00:08:49 -07:00
shallow.c
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
strbuf.c
strbuf.h
tag.c Clean up object creation to use more common code 2007-04-16 23:36:16 -07:00
tag.h
tar.h
test-chmtime.c
test-date.c
test-delta.c
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 git-branch, git-checkout: autosetup for remote branch tracking 2007-03-10 23:41:58 -08:00
tree-diff.c tree_entry_interesting(): allow it to say "everything is interesting" 2007-03-22 00:36:00 -07:00
tree-walk.c Switch over tree descriptors to contain a pre-parsed entry 2007-03-21 11:15:26 -07:00
tree-walk.h Switch over tree descriptors to contain a pre-parsed entry 2007-03-21 11:15:26 -07:00
tree.c Merge branch 'lt/objalloc' 2007-04-21 17:42:02 -07:00
tree.h
unpack-file.c convert object type handling from a string to a number 2007-02-27 01:34:21 -08:00
unpack-trees.c delay progress display when checking out files 2007-04-22 22:18:05 -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 git-upload-pack: make sure we close unused pipe ends 2007-03-29 01:41:23 -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 Merge branch 'maint' 2007-03-03 19:47:46 -08:00
utf8.h Actually make print_wrapped_text() useful 2007-02-27 17:29:02 -08:00
var.c
write_or_die.c
wt-status.c Optimize directory listing with pathspec limiter. 2007-03-31 17:41:32 -07:00
wt-status.h
xdiff-interface.c Cast 64 bit off_t to 32 bit size_t 2007-03-07 11:15:26 -08:00
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.