mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 18:32:37 +02:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
19,979 Commits 6 Branches 954 Tags 460 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
20c7e3d5cf
Go to file
Jonathan Nieder 20c7e3d5cf Show usage string for 'git merge-ours -h' 
This change is strictly about 'git merge-ours -h' without
any other options and arguments.

This change cannot break compatibility since merge drivers are
always passed '--', among other arguments.

Any usage string for this command is a lie, since it ignored its
arguments until now.  Still, it makes sense to let the user know
the expected usage when asked.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-09 17:08:45 -08:00
block-sha1
compat Use faster byte swapping when compiling with MSVC 2009-10-30 09:37:48 -07:00
contrib Retire fetch--tool helper to contrib/examples 2009-11-09 17:08:44 -08:00
Documentation Merge branch 'maint' 2009-11-04 16:34:02 -08:00
git-gui Merge git://repo.or.cz/git-gui 2009-10-27 14:55:37 -07:00
gitk-git
gitweb Merge branch 'sb/gitweb-link-author' 2009-10-25 18:40:21 -07:00
perl
ppc
t Merge branch 'jc/commit-s-subject-is-not-a-footer' 2009-11-06 23:17:47 -08:00
templates Revert "Don't create the $GIT_DIR/branches directory on init" 2009-10-31 11:16:50 -07:00
xdiff
.gitattributes
.gitignore Add intermediate build products to .gitignore 2009-11-08 17:04:50 -08:00
.mailmap
abspath.c
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin-add.c
builtin-annotate.c
builtin-apply.c
builtin-archive.c
builtin-bisect--helper.c
builtin-blame.c
builtin-branch.c
builtin-bundle.c
builtin-cat-file.c
builtin-check-attr.c
builtin-check-ref-format.c
builtin-checkout-index.c
builtin-checkout.c fixup tr/stash-format merge 2009-10-30 20:18:31 -07:00
builtin-clean.c
builtin-clone.c clone: detect extra arguments 2009-10-30 15:18:11 -07:00
builtin-commit-tree.c Show usage string for 'git commit-tree -h' 2009-11-09 17:08:44 -08:00
builtin-commit.c Merge branch 'jc/commit-s-subject-is-not-a-footer' 2009-11-06 23:17:47 -08:00
builtin-config.c
builtin-count-objects.c
builtin-describe.c Merge branch 'maint' 2009-10-23 22:40:18 -07:00
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c
builtin-diff.c
builtin-fast-export.c
builtin-fetch-pack.c
builtin-fetch.c
builtin-fmt-merge-msg.c
builtin-for-each-ref.c
builtin-fsck.c fsck: default to "git fsck --full" 2009-10-20 12:11:39 -07:00
builtin-gc.c gc --auto --quiet: make the notice a bit less verboase 2009-10-21 15:28:42 -07:00
builtin-grep.c Show usage string for 'git grep -h' 2009-11-09 17:08:44 -08:00
builtin-help.c help -a: do not unnecessarily look for a repository 2009-10-28 10:42:17 -07:00
builtin-init-db.c
builtin-log.c Show usage string for 'git cherry -h' 2009-11-09 17:08:44 -08:00
builtin-ls-files.c Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4 2009-10-25 15:34:27 -07:00
builtin-ls-remote.c Require a struct remote in transport_get() 2009-11-03 21:39:28 -08:00
builtin-ls-tree.c
builtin-mailinfo.c
builtin-mailsplit.c
builtin-merge-base.c
builtin-merge-file.c
builtin-merge-ours.c Show usage string for 'git merge-ours -h' 2009-11-09 17:08:45 -08:00
builtin-merge-recursive.c
builtin-merge.c
builtin-mktree.c
builtin-mv.c
builtin-name-rev.c
builtin-pack-objects.c pack-objects: move thread autodetection closer to relevant code 2009-11-05 23:11:42 -08:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c
builtin-push.c push: fix typo in usage 2009-10-30 15:12:00 -07:00
builtin-read-tree.c
builtin-receive-pack.c receive-pack: run "gc --auto --quiet" and optionally "update-server-info" 2009-10-21 15:32:32 -07:00
builtin-reflog.c
builtin-remote.c
builtin-replace.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-update-server-info.c
builtin-upload-archive.c
builtin-verify-pack.c
builtin-verify-tag.c
builtin-write-tree.c
builtin.h Retire fetch--tool helper to contrib/examples 2009-11-09 17:08:44 -08:00
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h
check_bindir
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c
command-list.txt
commit.c Merge branch 'jc/maint-1.6.3-graft-trailing-space' 2009-10-30 20:07:08 -07:00
commit.h fixup tr/stash-format merge 2009-10-30 20:18:31 -07:00
config.c
config.mak.in
configure.ac
connect.c
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
diff-lib.c
diff-no-index.c
diff.c Merge branch 'js/diff-verbose-submodule' 2009-10-30 20:16:26 -07:00
diff.h Add the --submodule option to the diff option family 2009-10-19 22:31:00 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c
dir.h
editor.c
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl Merge branch 'pv/maint-add-p-no-exclude' into maint 2009-10-23 22:29:19 -07:00
git-am.sh
git-archimport.perl
git-bisect.sh
git-compat-util.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--interactive.sh Merge branch 'maint' 2009-10-28 11:21:46 -07:00
git-rebase.sh
git-relink.perl
git-repack.sh
git-request-pull.sh
git-send-email.perl Merge branch 'jp/maint-send-email-fold' into maint 2009-10-23 22:30:42 -07:00
git-sh-setup.sh
git-stash.sh stash list: drop the default limit of 10 stashes 2009-10-19 22:28:26 -07:00
git-submodule.sh
git-svn.perl git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents 2009-10-26 23:54:24 -07:00
GIT-VERSION-GEN GIT 1.6.5.2 2009-10-25 18:37:56 -07:00
git-web--browse.sh
git.c Retire fetch--tool helper to contrib/examples 2009-11-09 17:08:44 -08:00
git.spec.in
graph.c
graph.h
grep.c
grep.h
hash-object.c
hash.c
hash.h
help.c
help.h
http-fetch.c
http-push.c
http-walker.c
http.c
http.h
ident.c
imap-send.c
index-pack.c
INSTALL
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c Introduce new pretty formats %g[sdD] for reflog information 2009-10-19 22:28:26 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile Retire fetch--tool helper to contrib/examples 2009-11-09 17:08:44 -08:00
match-trees.c
merge-file.c
merge-index.c
merge-recursive.c
merge-recursive.h
merge-tree.c
mktag.c
name-hash.c
object.c
object.h
pack-check.c
pack-redundant.c
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
patch-delta.c
patch-id.c
patch-ids.c
patch-ids.h
path.c
pkt-line.c
pkt-line.h
preload-index.c
pretty.c fixup tr/stash-format merge 2009-10-30 20:18:31 -07:00
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c
README
reflog-walk.c Introduce new pretty formats %g[sdD] for reflog information 2009-10-19 22:28:26 -07:00
reflog-walk.h Introduce new pretty formats %g[sdD] for reflog information 2009-10-19 22:28:26 -07:00
refs.c
refs.h
RelNotes GIT 1.6.5.2 2009-10-25 18:37:56 -07:00
remote-curl.c Allow curl helper to work without a local repository 2009-11-03 21:41:01 -08:00
remote.c
remote.h
replace_object.c
rerere.c
rerere.h
revision.c
revision.h
run-command.c
run-command.h
send-pack.h
server-info.c
setup.c
sha1_file.c Fix incorrect error check while reading deflated pack data 2009-10-21 23:19:47 -07:00
sha1_name.c
sha1-lookup.c
sha1-lookup.h
shallow.c
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 fixup tr/stash-format merge 2009-10-30 20:18:31 -07:00
submodule.h Add the --submodule option to the diff option family 2009-10-19 22:31:00 -07:00
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-match-trees.c
test-parse-options.c
test-path-utils.c
test-sha1.c
test-sha1.sh
test-sigchain.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c
transport.c Require a struct remote in transport_get() 2009-11-03 21:39:28 -08:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unpack-file.c
unpack-trees.c
unpack-trees.h
upload-pack.c
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
var.c
walker.c
walker.h
wrapper.c
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/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.