Go to file
Junio C Hamano b0ad11ea16 pull: allow "git pull origin $something:$current_branch" into an unborn branch
Some misguided documents floating on the Net suggest this sequence:

    mkdir newdir && cd newdir
    git init
    git remote add origin $url
    git pull origin master:master

"git pull" has known about misguided "pull" that lets the underlying fetch
update the current branch for a long time.  It also has known about
"git pull origin master" into a branch yet to be born.

These two workarounds however were not aware of the existence of each
other and did not work well together.  This fixes it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-10-17 11:26:20 -07:00
Documentation GIT 1.6.0.2 2008-09-12 16:18:47 -07:00
arm
compat Use compatibility regex library for OSX/Darwin 2008-09-10 13:36:40 -07:00
contrib bash completion: Hide more plumbing commands 2008-09-03 20:41:47 -07:00
git-gui Merge branch 'maint' of git://repo.or.cz/git-gui into maint 2008-09-06 16:03:22 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2008-08-16 23:21:07 -07:00
gitweb gitweb: More about how gitweb gets 'owner' of repository 2008-07-27 14:14:01 -07:00
mozilla-sha1
perl Git.pm: Use File::Temp->tempfile instead of ->new 2008-09-10 11:45:22 -07:00
ppc
t pull: allow "git pull origin $something:$current_branch" into an unborn branch 2008-10-17 11:26:20 -07:00
templates Install templates with the user and group of the installing personality 2008-08-20 16:01:45 -07:00
xdiff
.gitattributes
.gitignore
.mailmap .mailmap update 2008-07-19 11:25:51 -07:00
COPYING
GIT-VERSION-GEN GIT 1.6.0.2 2008-09-12 16:18:47 -07:00
INSTALL Fix typos in INSTALL 2008-08-04 21:52:08 -07:00
Makefile Use compatibility regex library also on FreeBSD 2008-09-11 09:44:28 -07:00
README
RelNotes Start 1.6.0.2 maintenance cycle 2008-09-03 15:39:19 -07:00
abspath.c Allow add_path() to add non-existent directories to the path 2008-07-25 17:41:13 -07:00
alias.c
alloc.c
archive-tar.c archive: remove unused headers 2008-07-19 11:17:43 -07:00
archive-zip.c archive: remove unused headers 2008-07-19 11:17:43 -07:00
archive.c pretty=format: respect date format options 2008-08-29 00:14:29 -07:00
archive.h archive: declare struct archiver where it's needed 2008-07-25 17:21:04 -07:00
attr.c Fix buffer overflow in prepare_attr_stack 2008-07-16 14:05:50 -07:00
attr.h
base85.c
blob.c
blob.h
branch.c
branch.h
builtin-add.c Merge branch 'jc/add-addremove' 2008-07-20 17:53:17 -07:00
builtin-annotate.c
builtin-apply.c Merge branch 'ho/dashless' into maint 2008-09-03 14:51:56 -07:00
builtin-archive.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-blame.c "blame -c" should be compatible with "annotate" 2008-09-05 00:57:35 -07:00
builtin-branch.c builtin-branch: fix -v for --[no-]merged 2008-07-27 14:14:01 -07:00
builtin-bundle.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-cat-file.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-check-attr.c
builtin-check-ref-format.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-checkout-index.c Start conforming code to "git subcmd" style part 2 2008-09-09 08:41:29 -07:00
builtin-checkout.c Merge branch 'jc/maint-checkout-fix' into maint 2008-09-10 02:13:41 -07:00
builtin-clean.c
builtin-clone.c clone: fix creation of explicitly named target directory 2008-09-03 12:32:41 -07:00
builtin-commit-tree.c Start conforming code to "git subcmd" style part 2 2008-09-09 08:41:29 -07:00
builtin-commit.c pretty=format: respect date format options 2008-08-29 00:14:29 -07:00
builtin-config.c Make non-static functions, that may be static, static 2008-07-23 18:38:14 -07:00
builtin-count-objects.c
builtin-describe.c Merge branch 'sb/dashless' 2008-07-16 17:22:50 -07:00
builtin-diff-files.c
builtin-diff-index.c diff*: fix worktree setup 2008-08-28 20:50:10 -07:00
builtin-diff-tree.c
builtin-diff.c diff*: fix worktree setup 2008-08-28 20:50:10 -07:00
builtin-fast-export.c Fix a warning (on cygwin) to allow -Werror 2008-08-26 16:22:00 -07:00
builtin-fetch--tool.c
builtin-fetch-pack.c Start conforming code to "git subcmd" style part 2 2008-09-09 08:41:29 -07:00
builtin-fetch.c Fix fetch/pull when run without --update-head-ok 2008-10-13 10:46:03 -07:00
builtin-fmt-merge-msg.c Merge branch 'sb/dashless' 2008-07-16 17:22:50 -07:00
builtin-for-each-ref.c for-each-ref: Allow a trailing slash in the patterns 2008-08-29 00:14:06 -07:00
builtin-fsck.c Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long 2008-08-05 21:21:20 -07:00
builtin-gc.c
builtin-grep.c Merge branch 'nd/worktree' into maint 2008-09-03 15:35:37 -07:00
builtin-http-fetch.c Start conforming code to "git subcmd" style part 2 2008-09-09 08:41:29 -07:00
builtin-init-db.c init: handle empty "template" parameter 2008-08-01 22:41:07 -07:00
builtin-log.c git format-patch: avoid underrun when format.headers is empty or all NLs 2008-08-19 18:08:00 -07:00
builtin-ls-files.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
builtin-ls-remote.c
builtin-ls-tree.c Add output flushing before fork() 2008-08-04 21:46:42 -07:00
builtin-mailinfo.c mailinfo: avoid violating strbuf assertion 2008-08-19 19:36:56 -07:00
builtin-mailsplit.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
builtin-merge-base.c merge-base: die with an error message if not passed a commit ref 2008-07-28 23:02:12 -07:00
builtin-merge-file.c
builtin-merge-ours.c
builtin-merge-recursive.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
builtin-merge.c merge: fix numerus bugs around "trivial merge" area 2008-08-23 18:17:22 -07:00
builtin-mv.c git-mv: Keep moved index entries inact 2008-07-27 15:05:19 -07:00
builtin-name-rev.c Merge branch 'maint' 2008-08-03 14:14:10 -07:00
builtin-pack-objects.c Merge branch 'np/maint-safer-pack' into maint 2008-09-10 02:12:47 -07:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long 2008-08-05 21:21:20 -07:00
builtin-push.c builtin-push.c: Cleanup - use OPT_BIT() and remove some variables 2008-07-20 14:41:49 -07:00
builtin-read-tree.c read-tree: setup worktree if merge is required 2008-08-28 22:47:17 -07:00
builtin-reflog.c Merge branch 'maint' 2008-08-11 00:53:31 -07:00
builtin-remote.c clone: Add an option to set up a mirror 2008-08-02 15:21:59 -07:00
builtin-rerere.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
builtin-reset.c git-reset: Let -q hush "locally modified" messages 2008-07-25 17:57:22 -07:00
builtin-rev-list.c Fix "git log -i --grep" 2008-08-24 23:28:02 -07:00
builtin-rev-parse.c rev-parse: Add support for the ^! and ^@ syntax 2008-07-27 14:14:01 -07:00
builtin-revert.c Merge branch 'maint' 2008-08-01 23:55:51 -07:00
builtin-rm.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
builtin-send-pack.c
builtin-shortlog.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
builtin-show-branch.c
builtin-show-ref.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
builtin-stripspace.c
builtin-symbolic-ref.c
builtin-tag.c Sync with 1.5.6.5 2008-08-06 13:50:48 -07:00
builtin-tar-tree.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
builtin-unpack-objects.c
builtin-update-index.c Merge branch 'nd/worktree' into maint 2008-09-03 15:35:37 -07:00
builtin-update-ref.c
builtin-upload-archive.c archive: define MAX_ARGS where it's needed 2008-07-25 17:20:55 -07:00
builtin-verify-pack.c discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
builtin-verify-tag.c builtin-verify-tag: fix -v option parsing 2008-07-28 23:02:11 -07:00
builtin-write-tree.c
builtin.h Allow pager of diff command be enabled/disabled 2008-07-23 11:14:47 -07:00
bundle.c
bundle.h
cache-tree.c cache-tree.c: make cache_tree_find() static 2008-07-16 08:50:27 -07:00
cache-tree.h cache-tree.c: make cache_tree_find() static 2008-07-16 08:50:27 -07:00
cache.h unpack_trees(): protect the handcrafted in-core index from read_cache() 2008-08-23 18:09:27 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
combine-diff.c diff: Help "less" hide ^M from the output 2008-08-30 20:34:45 -07:00
command-list.txt
commit.c sort_in_topological_order(): avoid setting a commit flag 2008-08-01 23:14:22 -07:00
commit.h pretty=format: respect date format options 2008-08-29 00:14:29 -07:00
config.c Make use of stat.ctime configurable 2008-07-28 23:26:25 -07:00
config.mak.in
configure.ac
connect.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
convert.c
copy.c
csum-file.c pack-objects: use fixup_pack_header_footer()'s validation mode 2008-08-29 21:51:27 -07:00
csum-file.h
ctype.c ctype.c: protect tiny C preprocessor constants 2008-08-27 16:14:22 -07:00
daemon.c git-daemon: SysV needs the signal handler reinstated. 2008-08-12 15:41:08 -07:00
date.c
decorate.c decorate: allow const objects to be decorated 2008-08-20 13:30:49 -07:00
decorate.h decorate: allow const objects to be decorated 2008-08-20 13:30:49 -07:00
delta.h
diff-delta.c
diff-lib.c Fix buffer overflow in git diff 2008-07-16 14:03:24 -07:00
diff-no-index.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
diff.c Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maint 2008-09-10 02:14:18 -07:00
diff.h diff --cumulative is a sub-option of --dirstat 2008-09-03 22:37:03 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c Fix escaping of glob special characters in pathspecs 2008-08-13 17:11:03 -07:00
dir.h
dump-cache-tree.c
editor.c editor.c: Libify launch_editor() 2008-07-25 17:09:38 -07:00
entry.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
environment.c Make use of stat.ctime configurable 2008-07-28 23:26:25 -07:00
exec_cmd.c Refactor, adding prepare_git_cmd(const char **argv) 2008-07-28 23:02:11 -07:00
exec_cmd.h Refactor, adding prepare_git_cmd(const char **argv) 2008-07-28 23:02:11 -07:00
fast-import.c improve reliability of fixup_pack_header_footer() 2008-08-29 21:51:27 -07:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl Make git-add -i accept ranges like 7- 2008-08-01 23:26:40 -07:00
git-am.sh git-am: ignore --binary option 2008-08-16 02:32:36 -07:00
git-archimport.perl
git-bisect.sh Merge branch 'maint' 2008-08-11 19:24:28 -07:00
git-compat-util.h Merge branch 'mv/merge-in-c' 2008-07-15 19:09:46 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl Merge branch 'maint' 2008-08-05 21:21:08 -07:00
git-cvsserver.perl cvsserver: Add cvs co -c support 2008-07-19 11:17:43 -07:00
git-filter-branch.sh filter-branch: be more helpful when an annotated tag changes 2008-08-08 16:19:51 -07:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool.sh
git-parse-remote.sh
git-pull.sh pull: allow "git pull origin $something:$current_branch" into an unborn branch 2008-10-17 11:26:20 -07:00
git-quiltimport.sh Rename .git/rebase to .git/rebase-apply 2008-07-21 18:51:47 -07:00
git-rebase--interactive.sh rebase -i -p: fix parent rewriting 2008-08-13 15:17:10 -07:00
git-rebase.sh Improve error output of git-rebase 2008-08-16 23:21:18 -07:00
git-relink.perl
git-repack.sh
git-request-pull.sh git-request-pull: replace call to deprecated peek-remote 2008-07-13 16:08:27 -07:00
git-send-email.perl Merge branch 'maint' 2008-07-25 13:56:36 -07:00
git-sh-setup.sh
git-stash.sh stash: refresh the index before deciding if the work tree is dirty 2008-09-06 16:16:42 -07:00
git-submodule.sh git-submodule: move ill placed shift. 2008-08-01 23:16:38 -07:00
git-svn.perl git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl 2008-09-10 11:47:06 -07:00
git-web--browse.sh
git.c diff*: fix worktree setup 2008-08-28 20:50:10 -07:00
git.spec.in
graph.c
graph.h
grep.c log --author/--committer: really match only with name part 2008-09-04 22:21:56 -07:00
grep.h log --author/--committer: really match only with name part 2008-09-04 22:21:56 -07:00
hash-object.c
hash.c
hash.h
help.c Fix 'git help help' 2008-08-21 22:18:21 -07:00
http-push.c
http-walker.c Merge branch 'maint' 2008-07-19 11:28:06 -07:00
http.c
http.h
ident.c Replace uses of "git-var" with "git var" 2008-07-30 11:42:01 -07:00
imap-send.c
index-pack.c index-pack: use fixup_pack_header_footer()'s validation mode 2008-08-29 21:51:28 -07:00
interpolate.c
interpolate.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c format-patch: Produce better output with --inline or --attach 2008-07-29 23:18:15 -07:00
log-tree.h
mailmap.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
mailmap.h Rename path_list to string_list 2008-07-21 19:11:50 -07:00
match-trees.c
merge-file.c
merge-index.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
merge-recursive.h
merge-tree.c
mktag.c
mktree.c
name-hash.c
object.c
object.h
pack-check.c
pack-redundant.c
pack-refs.c
pack-refs.h
pack-revindex.c discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
pack-revindex.h discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
pack-write.c fixup_pack_header_footer(): use nicely aligned buffer sizes 2008-08-29 21:51:28 -07:00
pack.h improve reliability of fixup_pack_header_footer() 2008-08-29 21:51:27 -07:00
pager.c
parse-options.c Sync with 1.5.6.5 2008-08-06 13:50:48 -07:00
parse-options.h Sync with 1.5.6.5 2008-08-06 13:50:48 -07:00
patch-delta.c
patch-id.c
patch-ids.c
patch-ids.h
path.c Fix typo in comments of longest_ancestor_length() 2008-08-11 16:44:54 -07:00
pkt-line.c
pkt-line.h
pretty.c pretty=format: respect date format options 2008-08-29 00:14:29 -07:00
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c unpack_trees(): protect the handcrafted in-core index from read_cache() 2008-08-23 18:09:27 -07:00
receive-pack.c Record the command invocation path early 2008-07-25 17:41:13 -07:00
reflog-walk.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
reflog-walk.h
refs.c
refs.h
remote.c remote.c: remove useless if-before-free test 2008-08-19 21:09:30 -07:00
remote.h
rerere.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
rerere.h Rename path_list to string_list 2008-07-21 19:11:50 -07:00
revision.c log --author/--committer: really match only with name part 2008-09-04 22:21:56 -07:00
revision.h Fix "git log -i --grep" 2008-08-24 23:28:02 -07:00
run-command.c Add output flushing before fork() 2008-08-04 21:46:42 -07:00
run-command.h
send-pack.h
server-info.c
setup.c setup_git_directory(): fix move to worktree toplevel directory 2008-08-30 23:41:12 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
sha1_name.c ignore non-existent refs in dwim_log() 2008-07-23 18:11:04 -07:00
shallow.c
shell.c shell: do not play duplicated definition games to shrink the executable 2008-08-29 22:38:41 -07:00
shortlog.h Rename path_list to string_list 2008-07-21 19:11:50 -07:00
show-index.c
sideband.c improve handling of sideband message display 2008-09-03 14:51:10 -07:00
sideband.h
strbuf.c
strbuf.h editor.c: Libify launch_editor() 2008-07-25 17:09:38 -07:00
string-list.c Rename path_list to string_list 2008-07-21 19:11:50 -07:00
string-list.h Rename path_list to string_list 2008-07-21 19:11:50 -07:00
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-date.c
test-delta.c
test-genrandom.c
test-match-trees.c
test-parse-options.c test-parse-options: use appropriate cast in length_callback 2008-08-13 18:11:44 -07:00
test-path-utils.c
test-sha1.c
test-sha1.sh
thread-utils.c
thread-utils.h
trace.c
transport.c Merge branch 'maint' 2008-08-09 01:40:08 -07:00
transport.h
tree-diff.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
tree-walk.c
tree-walk.h
tree.c add context pointer to read_tree_recursive() 2008-07-15 07:17:59 -07:00
tree.h add context pointer to read_tree_recursive() 2008-07-15 07:17:59 -07:00
unpack-file.c
unpack-trees.c unpack_trees(): protect the handcrafted in-core index from read_cache() 2008-08-23 18:09:27 -07:00
unpack-trees.h
update-server-info.c
upload-pack.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
usage.c
utf8.c
utf8.h
var.c Replace uses of "git-var" with "git var" 2008-07-30 11:42:01 -07:00
walker.c
walker.h
wrapper.c Move read_in_full() and write_in_full() to wrapper.c 2008-07-20 17:17:09 -07:00
write_or_die.c Move read_in_full() and write_in_full() to wrapper.c 2008-07-20 17:17:09 -07:00
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.