1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-07 17:53:12 +01:00
Find a file
Elijah Newren fa0ae3b1dd t6020: Add a testcase for modify/delete + directory/file conflict
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-09-29 17:32:37 -07:00
block-sha1
builtin Merge branch 'dr/maint-ls-tree-prefix-recursion-fix' 2010-09-15 12:41:13 -07:00
compat Merge branch 'ab/compat-regex' 2010-09-03 09:43:45 -07:00
contrib Merge branch 'jn/update-contrib-example-merge' 2010-09-03 09:43:42 -07:00
Documentation Git 1.7.3 2010-09-18 14:55:08 -07:00
git-gui Merge git://repo.or.cz/git-gui 2010-09-15 12:34:48 -07:00
git_remote_helpers
gitk-git
gitweb gitweb: Don't die_error in git_tag after already printing headers 2010-08-31 09:52:48 -07:00
perl perl/Makefile: Unset INSTALL_BASE when making perl.mak 2010-08-12 21:55:17 -07:00
ppc
t t6020: Add a testcase for modify/delete + directory/file conflict 2010-09-29 17:32:37 -07:00
templates
vcs-svn vcs-svn: Fix some printf format compiler warnings 2010-09-12 10:24:55 -07:00
xdiff
.gitattributes
.gitignore Merge branch 'ab/test-2' 2010-09-04 08:15:36 -07:00
.mailmap
abspath.c
aclocal.m4
advice.c
advice.h
alias.c split_cmdline: Allow caller to access error string 2010-08-11 09:36:23 -07:00
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c
attr.h
base85.c Standardize do { ... } while (0) style 2010-08-12 15:44:51 -07:00
bisect.c
bisect.h
blob.c
blob.h
branch.c builtin/checkout: handle -B from detached HEAD correctly 2010-08-09 12:57:17 -07:00
branch.h
builtin.h builtin.h: Move two functions definitions to help.h. 2010-09-01 08:00:51 -07:00
bundle.c bundle: detect if bundle file cannot be created 2010-08-27 16:46:26 -07:00
bundle.h
cache-tree.c cache_tree_free: Fix small memory leak 2010-09-06 17:32:28 -07:00
cache-tree.h
cache.h Merge branch 'kf/askpass-config' 2010-09-08 09:17:01 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
combine-diff.c
command-list.txt
commit.c Merge branch 'cc/find-commit-subject' 2010-08-18 12:46:55 -07:00
commit.h Merge branch 'cc/find-commit-subject' 2010-08-18 12:46:55 -07:00
config.c Merge branch 'kf/askpass-config' 2010-09-08 09:17:01 -07:00
config.mak.in Merge branch 'ab/compat-regex' 2010-09-03 09:43:45 -07:00
configure.ac Merge branch 'ab/compat-regex' 2010-09-03 09:43:45 -07:00
connect.c Allow core.askpass to override SSH_ASKPASS. 2010-08-31 10:49:17 -07:00
convert.c
copy.c
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta.h
diff-delta.c fix >4GiB source delta assertion failure 2010-08-21 23:53:26 -07:00
diff-lib.c Submodules: Add the new "ignore" config option for diff and status 2010-08-09 09:01:52 -07:00
diff-no-index.c
diff.c Merge branch 'maint' 2010-09-09 17:29:40 -07:00
diff.h Merge branch 'mm/shortopt-detached' 2010-08-21 23:28:31 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h diff --follow: do call diffcore_std() as necessary 2010-08-13 12:17:45 -07:00
dir.c
dir.h
editor.c
entry.c
environment.c Merge branch 'kf/askpass-config' 2010-09-08 09:17:01 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'en/d-f-conflict-fix' 2010-08-31 16:23:58 -07:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl
git-am.sh
git-archimport.perl
git-bisect.sh
git-compat-util.h vcs-svn: Fix some printf format compiler warnings 2010-09-12 10:24:55 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh filter-branch: retire --remap-to-ancestor 2010-08-27 16:47:01 -07:00
git-instaweb.sh instaweb: add access+error logging for WEBrick 2010-08-05 08:51:26 +00:00
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool: Remove explicit references to /dev/tty 2010-08-20 14:09:04 -07:00
git-mergetool.sh Merge branch 'cb/maint-mergetool-no-tty' 2010-09-03 09:43:44 -07:00
git-parse-remote.sh
git-pull.sh Merge branch 'en/rebase-against-rebase-fix' into maint 2010-09-01 13:43:55 -07:00
git-quiltimport.sh
git-rebase--interactive.sh git-rebase--interactive.sh: replace cut with ${v%% *} 2010-09-17 14:58:08 -07:00
git-rebase.sh Merge branch 'os/fix-rebase-diff-no-prefix' 2010-09-15 12:40:33 -07:00
git-relink.perl
git-remote-testgit.py
git-repack.sh
git-request-pull.sh
git-send-email.perl
git-sh-setup.sh
git-stash.sh detached-stash: simplify git stash show 2010-08-21 23:51:22 -07:00
git-submodule.sh submodule sync: Update "submodule.<name>.url" 2010-08-18 13:54:30 -07:00
git-svn.perl git-svn: fix fetch with deleted tag 2010-08-15 23:43:37 +00:00
GIT-VERSION-GEN Git 1.7.3 2010-09-18 14:55:08 -07:00
git-web--browse.sh
git.c Merge branch 'tf/cleanup-builtin-help-headers' 2010-09-08 09:17:01 -07:00
git.spec.in
graph.c Merge branch 'maint' 2010-08-22 20:18:37 -07:00
graph.h
grep.c
grep.h
hash.c
hash.h
help.c
help.h builtin.h: Move two functions definitions to help.h. 2010-09-01 08:00:51 -07:00
hex.c
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c Allow HTTP user agent string to be modified. 2010-08-11 14:07:31 -07:00
http.h Standardize do { ... } while (0) style 2010-08-12 15:44:51 -07:00
ident.c
imap-send.c imap-send: Fix sprintf usage 2010-08-09 11:35:46 -07:00
INSTALL
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c ll-merge: let caller decide whether to renormalize 2010-08-06 09:20:01 -07:00
ll-merge.h ll-merge: let caller decide whether to renormalize 2010-08-06 09:20:01 -07:00
lockfile.c
log-tree.c
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'maint' 2010-09-12 13:53:03 -07:00
match-trees.c
merge-file.c
merge-recursive.c merge-recursive: Restructure showing how to chain more process_* functions 2010-09-29 17:32:36 -07:00
merge-recursive.h Merge branch 'dg/local-mod-error-messages' 2010-09-03 22:23:49 -07:00
name-hash.c
notes-cache.c
notes-cache.h
notes.c notes: Don't create (empty) commit when removing non-existing notes 2010-08-31 11:07:34 -07:00
notes.h notes: Don't create (empty) commit when removing non-existing notes 2010-08-31 11:07:34 -07:00
object.c Merge branch 'maint' 2010-09-06 00:12:04 -07:00
object.h object.h: Add OBJECT_ARRAY_INIT macro and make use of it. 2010-08-29 22:42:49 -07:00
pack-check.c Typos in code comments, an error message, documentation 2010-08-22 13:25:08 -07:00
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 parse-options: clarify PARSE_OPT_NOARG description 2010-08-24 10:37:39 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'hv/submodule-find-ff-merge' 2010-08-21 23:27:59 -07:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c
progress.c
progress.h
quote.c
quote.h
reachable.c object.h: Add OBJECT_ARRAY_INIT macro and make use of it. 2010-08-29 22:42:49 -07:00
reachable.h
read-cache.c core: Stop leaking ondisk_cache_entrys 2010-08-11 09:57:43 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'hv/submodule-find-ff-merge' 2010-08-21 23:27:59 -07:00
refs.h
RelNotes Documentation: move RelNotes into a directory of their own 2010-09-06 17:41:18 -07:00
remote-curl.c Merge branch 'sp/fix-smart-http-deadlock-on-error' into maint 2010-08-18 16:30:11 -07:00
remote.c
remote.h
replace_object.c
rerere.c Merge branch 'jn/merge-renormalize' 2010-09-03 09:43:41 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'mm/shortopt-detached' 2010-08-21 23:28:31 -07:00
revision.h
run-command.c
run-command.h
send-pack.h
server-info.c
setup.c Merge branch 'jn/paginate-fix' 2010-08-31 16:23:31 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c
sha1_name.c Merge branch 'js/maint-reflog-beyond-horizon' 2010-09-03 22:24:29 -07:00
shallow.c object.h: Add OBJECT_ARRAY_INIT macro and make use of it. 2010-08-29 22:42:49 -07:00
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 Merge branch 'hv/submodule-find-ff-merge' 2010-08-21 23:27:59 -07:00
submodule.h Merge branch 'hv/submodule-find-ff-merge' 2010-08-21 23:27:59 -07:00
symlinks.c
tag.c Merge branch 'xx/trivial' into maint 2010-09-06 00:11:59 -07:00
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-line-buffer.c Add stream helper library 2010-08-14 19:35:37 -07:00
test-match-trees.c
test-obj-pool.c Add memory pool library 2010-08-14 19:35:37 -07:00
test-parse-options.c
test-path-utils.c
test-run-command.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-pool.c Add string-specific memory pool 2010-08-14 19:35:37 -07:00
test-svn-fe.c SVN dump parser 2010-08-14 19:35:38 -07:00
test-treap.c Add treap implementation 2010-08-14 19:35:37 -07:00
thread-utils.c
thread-utils.h
trace.c
transport-helper.c
transport.c
transport.h
tree-diff.c diff --follow: do call diffcore_std() as necessary 2010-08-13 12:17:45 -07:00
tree-walk.c unpack_trees: group error messages by type 2010-08-11 10:36:06 -07:00
tree-walk.h Merge branch 'maint' 2010-08-26 16:42:59 -07:00
tree.c
tree.h
unimplemented.sh
unpack-trees.c Merge branch 'dg/local-mod-error-messages' 2010-09-03 22:23:49 -07:00
unpack-trees.h Move "show_all_errors = 1" to setup_unpack_trees_porcelain() 2010-09-03 09:31:51 -07:00
upload-pack.c object.h: Add OBJECT_ARRAY_INIT macro and make use of it. 2010-08-29 22:42:49 -07:00
url.c
url.h
usage.c
userdiff.c Userdiff patterns for C# 2010-08-16 18:28:27 -07:00
userdiff.h
utf8.c
utf8.h
walker.c
walker.h
wrap-for-bin.sh
wrapper.c xmalloc: include size in the failure message 2010-08-20 09:27:38 -07:00
write_or_die.c
ws.c
wt-status.c Submodules: Add the new "ignore" config option for diff and status 2010-08-09 09:01:52 -07:00
wt-status.h
xdiff-interface.c xdiff-interface.c: always trim trailing space from xfuncname matches 2010-09-09 17:18:29 -07:00
xdiff-interface.h

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

	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.