1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-07 09:43:00 +01:00
Find a file
Junio C Hamano 83ce176449 Merge branch 'cn/branch-set-upstream-to'
"git branch --set-upstream origin/master" is a common mistake to
create a local branch 'origin/master' and set it to integrate with
the current branch.  With a plan to deprecate this option, introduce
"git branch (-u|--set-upstream-to) origin/master" that sets the
current branch to integrate with 'origin/master' remote tracking
branch.

* cn/branch-set-upstream-to:
  branch: deprecate --set-upstream and show help if we detect possible mistaken use
  branch: add --unset-upstream option
  branch: introduce --set-upstream-to
2012-09-10 15:43:07 -07:00
block-sha1 Merge branch 'jn/block-sha1' into maint 2012-08-06 15:40:00 -07:00
builtin Merge branch 'cn/branch-set-upstream-to' 2012-09-10 15:43:07 -07:00
compat Merge branch 'js/compat-mkdir' 2012-09-03 15:54:37 -07:00
contrib Merge branch 'ph/credential-gnome-keyring' 2012-09-10 15:42:30 -07:00
Documentation Merge branch 'cn/branch-set-upstream-to' 2012-09-10 15:43:07 -07:00
git-gui
git_remote_helpers
gitk-git
gitweb Merge branch 'maint-1.7.11' into maint 2012-09-10 15:31:06 -07:00
mergetools Add Code Compare v2.80.4 as a merge / diff tool for Windows 2012-08-10 08:08:08 -07:00
perl Merge branch 'ms/git-svn-1.7' 2012-08-22 11:51:20 -07:00
po l10n: Fixes to Swedish translation 2012-08-16 13:57:51 +01:00
ppc
t Merge branch 'cn/branch-set-upstream-to' 2012-09-10 15:43:07 -07:00
templates
vcs-svn Merge branch 'jn/vcs-svn' 2012-07-13 15:37:04 -07:00
xdiff
.gitattributes
.gitignore Merge branch 'jn/makefile-cleanup' 2012-07-15 21:39:17 -07:00
.mailmap Update mailmap for a handful of folks 2012-09-03 16:24:23 -07:00
abspath.c
aclocal.m4
advice.c Merge branch 'jk/maint-advise-vaddf' into maint 2012-07-30 13:05:25 -07:00
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c Reduce translations by using same terminologies 2012-08-22 12:02:28 -07:00
archive.h
argv-array.c
argv-array.h
attr.c warn_on_inaccessible(): a helper to warn on inaccessible paths 2012-08-21 14:52:07 -07:00
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h Merge branch 'maint-1.7.11' into maint 2012-09-10 15:31:06 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'jc/maint-config-exit-status' 2012-09-03 15:53:07 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
command-list.txt command-list: mention git-credential-* helpers 2012-08-08 12:11:54 -07:00
commit.c Merge branch 'lt/commit-tree-guess-utf-8' 2012-09-07 11:08:38 -07:00
commit.h
config.c config: warn on inaccessible files 2012-08-21 14:46:11 -07:00
config.mak.in
configure.ac build: reconfigure automatically if configure.ac changes 2012-07-19 10:30:26 -07:00
connect.c Merge branch 'jc/capabilities' 2012-08-29 14:50:07 -07:00
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c credential: convert "url" attribute into its parsed subparts 2012-07-18 13:26:58 -07:00
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c daemon: --access-hook option 2012-08-15 11:01:55 -07:00
date.c Merge branch 'jc/maint-filter-branch-epoch-date' into maint 2012-07-30 13:04:18 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c diff: do not use null sha1 as a sentinel value 2012-07-29 15:04:32 -07:00
diff-no-index.c Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
diff.c Merge branch 'maint-1.7.11' into maint 2012-09-10 15:31:06 -07:00
diff.h Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
diffcore.h Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
dir.c warn_on_inaccessible(): a helper to warn on inaccessible paths 2012-08-21 14:52:07 -07:00
dir.h Merge branch 'jc/ls-files-i-dir' into maint 2012-07-11 12:44:35 -07:00
editor.c
entry.c
environment.c git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.h
fixup-builtins
fmt-merge-msg.h
fsck.c Merge branch 'jk/maint-null-in-trees' into maint-1.7.11 2012-09-10 15:24:54 -07:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h gettext: do not translate empty string 2012-08-20 20:57:41 -07:00
git-add--interactive.perl
git-am.sh Merge branch 'nd/am-i18n-fix' 2012-09-07 11:09:04 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'jk/config-warn-on-inaccessible-paths' 2012-09-07 11:08:56 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl difftool: silence warning 2012-08-21 15:27:15 -07:00
git-filter-branch.sh Merge branch 'jc/maint-filter-branch-epoch-date' into maint 2012-07-30 13:04:18 -07:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh Merge branch 'da/difftool-updates' 2012-08-27 11:55:17 -07:00
git-mergetool.sh mergetool: style fixes 2012-08-23 21:30:51 -07:00
git-p4.py git p4: make branch detection work with --use-client-spec 2012-08-20 15:52:48 -07:00
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'maint-1.7.11' into maint 2012-09-10 15:31:06 -07:00
git-rebase--merge.sh
git-rebase.sh git-rebase.sh: fix typo in an error message 2012-08-01 13:58:47 -07:00
git-relink.perl
git-remote-testgit.py
git-repack.sh
git-request-pull.sh
git-send-email.perl Merge branch 'jc/send-email-reconfirm' 2012-09-03 15:53:54 -07:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'jc/maint-protect-sh-from-ifs' into maint-1.7.11 2012-09-10 15:25:45 -07:00
git-stash.sh Merge branch 'ph/stash-rerere' 2012-09-03 15:54:12 -07:00
git-submodule.sh Merge branch 'sz/submodule-force-update' 2012-09-03 15:54:18 -07:00
git-svn.perl Merge branch 'ms/git-svn-1.7' 2012-08-22 11:51:20 -07:00
GIT-VERSION-GEN Kick off cycle towards 1.8.0 2012-08-22 11:54:47 -07:00
git-web--browse.sh
git.c
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h grep: add a grep.patternType configuration setting 2012-08-03 09:58:02 -07:00
hash.c
hash.h
help.c help.c::exclude_cmds(): plug a leak 2012-07-25 11:08:59 -07:00
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'jk/maint-http-half-auth-push' 2012-09-07 11:09:50 -07:00
http.h http: factor out http error code handling 2012-08-27 10:49:09 -07:00
ident.c
imap-send.c
INSTALL
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11 2012-08-24 12:05:11 -07:00
match-trees.c
merge-file.c
merge-file.h
merge-recursive.c Merge branch 'tr/void-diff-setup-done' 2012-08-22 11:52:27 -07:00
merge-recursive.h
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c Merge branch 'tr/void-diff-setup-done' 2012-08-22 11:52:27 -07:00
notes-merge.h
notes.c
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-cb.c
parse-options.c git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
parse-options.h i18n: mark "style" in OPT_COLUMN() for translation 2012-08-20 12:23:14 -07:00
patch-delta.c
patch-ids.c diff_setup_done(): return void 2012-08-03 12:11:07 -07:00
patch-ids.h
path.c
pkt-line.c
pkt-line.h
preload-index.c
pretty.c
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'maint-1.7.11' into maint 2012-09-10 15:31:06 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c
refs.h
RelNotes Start preparing for 1.7.12.1 2012-09-10 15:39:15 -07:00
remote-curl.c http: prompt for credentials on failed POST 2012-08-27 10:49:09 -07:00
remote.c Merge branch 'jk/push-delete-ref-error-message' into maint 2012-07-22 13:04:25 -07:00
remote.h
replace_object.c
rerere.c Merge branch 'ar/clone-honor-umask-at-top' 2012-07-15 21:39:04 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'mz/cherry-pick-cmdline-order' 2012-09-10 15:42:55 -07:00
revision.h Merge branch 'mz/cherry-pick-cmdline-order' 2012-09-10 15:42:55 -07:00
run-command.c Merge branch 'jc/maint-sane-execvp-notdir' 2012-09-03 15:53:26 -07:00
run-command.h
send-pack.h
sequencer.c Merge branch 'mz/cherry-pick-cmdline-order' 2012-09-10 15:42:55 -07:00
sequencer.h cherry-pick: add --allow-empty-message option 2012-08-06 09:59:53 -07:00
server-info.c
setup.c Merge branch 'maint-1.7.11' into maint 2012-09-10 15:31:06 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c sha1_file.c: introduce get_max_fd_limit() helper 2012-08-24 09:46:01 -07:00
sha1_name.c Merge branch 'jc/sha1-name-more' 2012-07-22 12:55:07 -07:00
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
submodule.c Merge branch 'tr/void-diff-setup-done' 2012-08-22 11:52:27 -07:00
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-line-buffer.c vcs-svn: drop no-op reset methods 2012-07-05 23:26:51 -05:00
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-subprocess.c
test-svn-fe.c vcs-svn: drop no-op reset methods 2012-07-05 23:26:51 -05:00
thread-utils.c
thread-utils.h
trace.c
transport-helper.c Add explanatory comment for transport-helpers refs mapping. 2012-07-30 12:22:35 -07:00
transport.c
transport.h
tree-diff.c Merge branch 'jk/maint-null-in-trees' 2012-08-27 11:54:28 -07:00
tree-walk.c
tree-walk.h
tree.c Strip namelen out of ce_flags into a ce_namelen field 2012-07-11 09:42:45 -07:00
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'tg/ce-namelen-field' 2012-07-23 20:55:21 -07:00
unpack-trees.h
upload-pack.c include agent identifier in capability string 2012-08-03 13:03:34 -07:00
url.c
url.h
usage.c
userdiff.c
userdiff.h
utf8.c git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
utf8.h git on Mac OS and precomposed unicode 2012-07-08 22:03:46 -07:00
varint.c
varint.h
version.c include agent identifier in capability string 2012-08-03 13:03:34 -07:00
version.h include agent identifier in capability string 2012-08-03 13:03:34 -07:00
walker.c
walker.h
wrap-for-bin.sh
wrapper.c warn_on_inaccessible(): a helper to warn on inaccessible paths 2012-08-21 14:52:07 -07:00
write_or_die.c
ws.c
wt-status.c status: color in-progress message like other header messages 2012-07-16 09:37:29 -07:00
wt-status.h status: color in-progress message like other header messages 2012-07-16 09:37:29 -07:00
xdiff-interface.c
xdiff-interface.h
zlib.c

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

	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 (read
Documentation/SubmittingPatches for instructions on patch submission).
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.