1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-02 15:28:21 +01:00
Find a file
Björn Gustavsson 9858b87fbb bash: add the merge option --ff-only
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-11-14 15:34:37 -08:00
block-sha1
compat Use faster byte swapping when compiling with MSVC 2009-10-30 09:37:48 -07:00
contrib bash: add the merge option --ff-only 2009-11-14 15:34:37 -08:00
Documentation git-describe.txt: formatting fix 2009-11-10 14:06:41 -08:00
git-gui Merge git://repo.or.cz/git-gui 2009-10-27 14:55:37 -07:00
gitk-git Merge git://git.kernel.org/pub/scm/gitk/gitk 2009-09-20 23:47:52 -07:00
gitweb Merge branch 'pb/maint-gitweb-blob-lineno' 2009-11-10 12:35:31 -08:00
perl perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR 2009-09-25 14:00:04 -07:00
ppc
t Merge branch 'jk/maint-format-patch-p-suppress-stat' 2009-11-10 12:35:56 -08:00
templates Revert "Don't create the $GIT_DIR/branches directory on init" 2009-10-31 11:16:50 -07:00
xdiff Merge branch 'tf/diff-whitespace-incomplete-line' into maint 2009-09-16 14:27:08 -07:00
.gitattributes
.gitignore Merge branch 'jk/gitignore-anchored' 2009-11-10 12:31:11 -08:00
.mailmap Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
abspath.c abspath.c: move declaration of 'len' into inner block and use appropriate type 2009-08-27 16:20:53 -07:00
advice.c status: make "how to stage" messages optional 2009-09-11 21:33:24 -07:00
advice.h status: make "how to stage" messages optional 2009-09-11 21:33:24 -07:00
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c Refactor pretty_print_commit arguments into a struct 2009-10-19 22:28:20 -07:00
archive.h
attr.c
attr.h
base85.c
bisect.c git-bisect: call the found commit "*the* first bad commit" 2009-08-26 12:05:57 -07:00
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin-add.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
builtin-annotate.c
builtin-apply.c Merge branch 'jc/maint-blank-at-eof' 2009-10-17 00:11:03 -07:00
builtin-archive.c git-archive: infer output format from filename when unspecified 2009-09-13 13:54:39 -07:00
builtin-bisect--helper.c
builtin-blame.c blame: make sure that the last line ends in an LF 2009-10-21 17:16:58 -07:00
builtin-branch.c Refactor pretty_print_commit arguments into a struct 2009-10-19 22:28:20 -07:00
builtin-bundle.c Update the usage bundle string. 2009-09-18 19:47:15 -07:00
builtin-cat-file.c
builtin-check-attr.c
builtin-check-ref-format.c check-ref-format -h: it does not know the --print option yet 2009-11-10 20:45:23 -08:00
builtin-checkout-index.c
builtin-checkout.c fixup tr/stash-format merge 2009-10-30 20:18:31 -07:00
builtin-clean.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-clone.c clone: detect extra arguments 2009-10-30 15:18:11 -07:00
builtin-commit-tree.c
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 'tr/describe-advice' 2009-11-10 12:35:08 -08:00
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c
builtin-diff.c
builtin-fast-export.c
builtin-fetch--tool.c
builtin-fetch-pack.c
builtin-fetch.c fetch: Speed up fetch by rewriting find_non_local_tags 2009-09-18 16:32:33 -07:00
builtin-fmt-merge-msg.c
builtin-for-each-ref.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
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 Merge branch 'maint-1.6.4' into maint 2009-10-16 23:47:58 -07: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 Merge branch 'jk/maint-format-patch-p-suppress-stat' 2009-11-10 12:35:56 -08:00
builtin-ls-files.c Merge branch 'jk/maint-1.6.3-ls-files-i' 2009-11-10 12:33:28 -08: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-mailinfo.c: check error status from rewind and ftruncate 2009-09-29 09:40:55 -07:00
builtin-mailsplit.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
builtin-merge-base.c
builtin-merge-file.c
builtin-merge-ours.c
builtin-merge-recursive.c
builtin-merge.c Merge branch 'maint' 2009-11-10 12:36:26 -08:00
builtin-mktree.c
builtin-mv.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
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 Merge branch 'jk/maint-push-config' 2009-11-10 12:31:42 -08: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 use write_str_in_full helper to avoid literal string lengths 2009-09-13 01:31:10 -07:00
builtin-remote.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
builtin-replace.c
builtin-rerere.c
builtin-reset.c Merge branch 'tr/reset-checkout-patch' 2009-09-07 15:24:38 -07:00
builtin-rev-list.c Refactor pretty_print_commit arguments into a struct 2009-10-19 22:28:20 -07:00
builtin-rev-parse.c
builtin-revert.c
builtin-rm.c
builtin-send-pack.c
builtin-shortlog.c Refactor pretty_print_commit arguments into a struct 2009-10-19 22:28:20 -07:00
builtin-show-branch.c Refactor pretty_print_commit arguments into a struct 2009-10-19 22:28:20 -07:00
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c
builtin-tag.c UI consistency: allow --force for where -f means force 2009-08-29 14:08:03 -07:00
builtin-tar-tree.c
builtin-unpack-objects.c Merge branch 'jc/maint-unpack-objects-strict' into maint 2009-09-16 14:45:18 -07:00
builtin-update-index.c
builtin-update-ref.c
builtin-update-server-info.c update-server-info: make builtin, use parseopt 2009-08-29 14:07:25 -07:00
builtin-upload-archive.c
builtin-verify-pack.c
builtin-verify-tag.c
builtin-write-tree.c
builtin.h update-server-info: make builtin, use parseopt 2009-08-29 14:07:25 -07:00
bundle.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
bundle.h
cache-tree.c
cache-tree.h
cache.h check_filename(): make verify_filename() callable without dying 2009-10-18 00:38:03 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
combine-diff.c
command-list.txt Documentation: add 'git replace' to main git manpage 2009-10-11 21:52:22 -07:00
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 Merge branch 'jk/unwanted-advices' 2009-09-13 01:33:18 -07:00
config.mak.in
configure.ac
connect.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
convert.c
copy.c preserve mtime of local clone 2009-09-13 01:32:26 -07:00
COPYING
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c Fix '--relative-date' 2009-10-03 06:04:38 -04:00
decorate.c
decorate.h
delta.h
diff-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
diff-lib.c Merge branch 'jc/shortstatus' 2009-08-28 19:38:19 -07:00
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 fast-import.c::validate_raw_date(): really validate the value 2009-10-07 13:05:03 -07:00
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-am: force egrep to use correct characters set 2009-09-25 15:35:05 -07:00
git-archimport.perl
git-bisect.sh bisect reset: Allow resetting to any commit, not just a branch 2009-10-13 23:19:02 -07:00
git-compat-util.h add NORETURN_PTR for function pointers 2009-10-01 04:12:21 -04:00
git-cvsexportcommit.perl
git-cvsimport.perl cvsimport: fix relative argument filenames 2009-10-19 00:31:02 -07:00
git-cvsserver.perl git-cvsserver: no longer use deprecated 'git-subcommand' commands 2009-09-02 18:41:42 -07:00
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh instaweb: support mod_cgid for apache2 2009-09-29 10:06:52 -07:00
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 Teach 'git merge' and 'git pull' the option --ff-only 2009-10-30 16:02:26 -07:00
git-quiltimport.sh
git-rebase--interactive.sh Merge branch 'maint' 2009-10-28 11:21:46 -07:00
git-rebase.sh rebase: use plumbing to show dirty state 2009-09-11 21:41:15 -07:00
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 typo fix: Directory `...' exist, ...: s/exist/exists/ 2009-09-29 08:30:13 -07:00
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 web--browse: fix Mac OS X GUI detection for 10.6 2009-09-14 02:27:25 -07:00
git.c git: add --no-replace-objects option to disable replacing 2009-10-13 01:07:29 -07:00
git.spec.in Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
graph.c Merge branch 'as/maint-graph-interesting-fix' 2009-08-27 16:59:56 -07:00
graph.h
grep.c
grep.h Merge branch 'maint' 2009-09-13 01:30:53 -07:00
hash-object.c
hash.c
hash.h
help.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
help.h
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'maint' 2009-09-14 14:48:27 -07:00
http.h
ident.c
imap-send.c imap-send.c: fix compiler warnings for OpenSSL 1.0 2009-10-31 14:28:18 -07:00
index-pack.c increase portability of NORETURN declarations 2009-10-01 04:12:21 -04:00
INSTALL INSTALL: Describe dependency knobs from Makefile 2009-09-10 21:34:43 -07:00
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c git branch -D: give a better error message when lockfile creation fails 2009-09-29 08:14:47 -07:00
log-tree.c Introduce new pretty formats %g[sdD] for reflog information 2009-10-19 22:28:26 -07:00
log-tree.h git-log: allow --decorate[=short|full] 2009-08-26 12:05:58 -07:00
mailmap.c
mailmap.h
Makefile Merge branch 'maint' 2009-11-01 22:10:08 -08:00
match-trees.c
merge-file.c
merge-index.c
merge-recursive.c merge-recursive: give less scary messages when merge did not start 2009-09-08 14:46:36 -07:00
merge-recursive.h
merge-tree.c
mktag.c
name-hash.c
object.c
object.h
pack-check.c
pack-redundant.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
parse-options.c parse-opt: ignore negation of OPT_NONEG for ambiguity checks 2009-09-29 07:28:47 -07:00
parse-options.h
patch-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
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 change throughput display units with fast links 2009-10-14 01:19:29 -07:00
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c
README README: git lives at http://git-scm.com these days 2009-10-07 12:47:24 -07:00
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 git branch -D: give a better error message when lockfile creation fails 2009-09-29 08:14:47 -07:00
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 Add url.<base>.pushInsteadOf: URL rewriting for push only 2009-09-08 01:18:46 -07:00
remote.h
replace_object.c
rerere.c use write_str_in_full helper to avoid literal string lengths 2009-09-13 01:31:10 -07:00
rerere.h
revision.c improve reflog date/number heuristic 2009-09-29 10:06:49 -07:00
revision.h improve reflog date/number heuristic 2009-09-29 10:06:49 -07:00
run-command.c Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
run-command.h Test for WIN32 instead of __MINGW32_ 2009-09-18 20:00:42 -07:00
send-pack.h
server-info.c
setup.c check_filename(): make verify_filename() callable without dying 2009-10-18 00:38:03 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Fix incorrect error check while reading deflated pack data 2009-10-21 23:19:47 -07:00
sha1_name.c
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 refactor test-date interface 2009-08-30 22:04:46 -07:00
test-delta.c Nicolas Pitre has a new email address 2009-09-14 02:23:36 -07:00
test-dump-cache-tree.c
test-genrandom.c test-genrandom: ensure stdout is set to _O_BINARY on Windows 2009-09-21 00:36:12 -07:00
test-match-trees.c
test-parse-options.c parse-opt: ignore negation of OPT_NONEG for ambiguity checks 2009-09-29 07:28:47 -07:00
test-path-utils.c
test-sha1.c
test-sha1.sh
test-sigchain.c
thread-utils.c Make usage of windows.h lean and mean 2009-09-18 20:00:42 -07:00
thread-utils.h
trace.c
transport-helper.c don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
transport.c Require a struct remote in transport_get() 2009-11-03 21:39:28 -08:00
transport.h Merge branch 'db/vcs-helper' 2009-09-13 01:31:55 -07:00
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 don't dereference NULL upon fdopen failure 2009-09-13 01:32:20 -07:00
usage.c add NORETURN_PTR for function pointers 2009-10-01 04:12:21 -04:00
userdiff.c
userdiff.h
utf8.c
utf8.h
var.c Style fixes, add a space after if/for/while. 2009-08-31 23:26:28 -07:00
walker.c
walker.h
wrapper.c
write_or_die.c
ws.c Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-at-eof 2009-09-15 03:28:08 -07:00
wt-status.c status: make "how to stage" messages optional 2009-09-11 21:33:24 -07:00
wt-status.h
xdiff-interface.c
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.