1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 23:14:51 +01:00
Find a file
Sverre Rabbelier b2f82e05de Teach rebase to rebase even if upstream is up to date
Normally, if the current branch is up to date, the rebase is aborted.
However, it may be desirable to allow rebasing even if the current
branch is up to date. When using the '--whitespace=fix' option -f is
implied.

Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-13 17:17:47 -08:00
arm
compat
contrib Fix contrib/hooks/post-receive-email for new duplicate branch 2009-02-11 10:38:53 -08:00
Documentation Update documentation to add further information about using Thunderbird with git-imap-send. 2009-02-12 17:46:05 -08:00
git-gui
gitk-git
gitweb Merge branch 'maint' 2009-02-08 22:07:53 -08:00
mozilla-sha1
perl
ppc
t Install the default "master" branch configuration after cloning a void 2009-02-12 22:37:35 -08:00
templates
xdiff Merge branch 'kc/maint-diff-bwi-fix' into maint 2009-02-05 17:52:22 -08:00
.gitattributes
.gitignore Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
.mailmap
abspath.c
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c tree.c: allow read_tree_recursive() to traverse gitlink entries 2009-02-07 12:14:34 -08:00
archive.h
attr.c
attr.h
base85.c
blob.c
blob.h
branch.c
branch.h
builtin-add.c
builtin-annotate.c
builtin-apply.c Merge branch 'jc/maint-apply-fix' into maint 2009-02-05 18:06:11 -08:00
builtin-archive.c
builtin-blame.c builtin-blame.c: Use utf8_strwidth for author's names 2009-02-04 16:30:45 -08:00
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 Merge branch 'tr/previous-branch' 2009-01-28 15:00:27 -08:00
builtin-clean.c
builtin-clone.c Install the default "master" branch configuration after cloning a void 2009-02-12 22:37:35 -08:00
builtin-commit-tree.c
builtin-commit.c Generalize and libify index_is_dirty() to index_differs_from(...) 2009-02-10 22:25:39 -08:00
builtin-config.c
builtin-count-objects.c
builtin-describe.c
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c
builtin-diff.c
builtin-fast-export.c Merge branch 'maint-1.6.0' into maint 2009-02-11 18:32:37 -08:00
builtin-fetch--tool.c
builtin-fetch-pack.c
builtin-fetch.c
builtin-fmt-merge-msg.c
builtin-for-each-ref.c
builtin-fsck.c fsck: check loose objects from alternate object stores by default 2009-01-30 19:23:22 -08:00
builtin-gc.c
builtin-grep.c Merge branch 'maint-1.6.0' into maint 2009-02-03 00:32:29 -08:00
builtin-help.c
builtin-http-fetch.c
builtin-init-db.c
builtin-log.c Merge branch 'jc/maint-format-patch-o-relative' into maint 2009-01-28 23:56:13 -08:00
builtin-ls-files.c Let ls-files strip trailing slashes in submodules' paths 2009-02-07 12:49:50 -08:00
builtin-ls-remote.c
builtin-ls-tree.c tree.c: allow read_tree_recursive() to traverse gitlink entries 2009-02-07 12:14:34 -08:00
builtin-mailinfo.c mailinfo: cleanup extra spaces for complex 'From:' 2009-02-01 12:11:15 -08:00
builtin-mailsplit.c
builtin-merge-base.c
builtin-merge-file.c
builtin-merge-ours.c
builtin-merge-recursive.c
builtin-merge.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
builtin-mv.c builtin-mv.c: check for unversionned files before looking at the destination. 2009-02-04 11:07:42 -08:00
builtin-name-rev.c
builtin-pack-objects.c Merge branch 'lt/maint-wrap-zlib' into maint 2009-02-05 18:01:00 -08:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c
builtin-push.c
builtin-read-tree.c
builtin-receive-pack.c builtin-receive-pack.c: do not initialize statics to 0 2009-02-10 22:27:14 -08:00
builtin-reflog.c
builtin-remote.c remote prune: warn dangling symrefs 2009-02-10 22:26:20 -08:00
builtin-rerere.c
builtin-reset.c
builtin-rev-list.c rev-list: fix showing distance when using --bisect-all 2009-02-08 12:48:28 -08:00
builtin-rev-parse.c
builtin-revert.c Generalize and libify index_is_dirty() to index_differs_from(...) 2009-02-10 22:25:39 -08:00
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 symbolic ref: refuse non-ref targets in HEAD 2009-01-29 01:00:48 -08:00
builtin-tag.c
builtin-tar-tree.c
builtin-unpack-objects.c Merge branch 'lt/maint-wrap-zlib' into maint 2009-02-05 18:01:00 -08:00
builtin-update-index.c
builtin-update-ref.c
builtin-upload-archive.c
builtin-verify-pack.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
builtin-verify-tag.c
builtin-write-tree.c
builtin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
combine-diff.c
command-list.txt Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
commit.c Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
commit.h
config.c Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
config.mak.in config.mak.in: define paths without trailing slash 2009-02-05 00:29:23 -08:00
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 Generalize and libify index_is_dirty() to index_differs_from(...) 2009-02-10 22:25:39 -08:00
diff-no-index.c Fix 'git diff --no-index' with a non-existing symlink target 2009-01-30 21:11:24 -08:00
diff.c Bugfix: GIT_EXTERNAL_DIFF with more than one changed files 2009-02-12 12:31:52 -08:00
diff.h Generalize and libify index_is_dirty() to index_differs_from(...) 2009-02-10 22:25:39 -08: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 Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
exec_cmd.c
exec_cmd.h
fast-import.c Drop double-semicolon in C 2009-02-10 22:26:37 -08:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl add -p: get rid of Git.pm warnings about unitialized values 2009-02-08 13:06:33 -08:00
git-am.sh Merge branch 'ns/am-slacker' 2009-02-04 13:07:02 -08:00
git-archimport.perl
git-bisect.sh
git-compat-util.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl git-cvsserver: run post-update hook *after* update. 2009-01-30 21:11:46 -08:00
git-filter-branch.sh filter-branch: Add more error-handling 2009-02-11 18:26:52 -08:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool.sh Merge branch 'cb/mergetool' 2009-02-05 19:40:35 -08:00
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--interactive.sh Merge branch 'js/maint-rebase-i-submodule' 2009-01-31 18:07:55 -08:00
git-rebase.sh Teach rebase to rebase even if upstream is up to date 2009-02-13 17:17:47 -08:00
git-relink.perl
git-repack.sh Make repack less likely to corrupt repository 2009-02-11 18:32:16 -08:00
git-request-pull.sh
git-send-email.perl
git-sh-setup.sh
git-stash.sh
git-submodule.sh submodule: warn about non-submodules 2009-02-07 12:49:58 -08:00
git-svn.perl git-svn: fix broken symlink workaround when switching branches 2009-02-11 02:02:04 -08:00
GIT-VERSION-GEN GIT 1.6.1.3 2009-02-07 00:51:47 -08:00
git-web--browse.sh git-web--browse: Fix check for /bin/start 2009-02-09 00:06:36 -08:00
git.c Merge branch 'jk/maint-cleanup-after-exec-failure' 2009-02-03 00:26:12 -08:00
git.spec.in Merge branch 'maint-1.6.0' into maint 2009-02-05 19:38:58 -08:00
graph.c
graph.h
grep.c
grep.h
hash-object.c
hash.c
hash.h
help.c
help.h
http-push.c Merge branch 'rc/http-push' 2009-02-05 19:40:36 -08:00
http-walker.c Merge branch 'lt/maint-wrap-zlib' into maint 2009-02-05 18:01:00 -08:00
http.c
http.h
ident.c
imap-send.c
index-pack.c Merge branch 'lt/maint-wrap-zlib' into maint 2009-02-05 18:01:00 -08:00
INSTALL
levenshtein.c
levenshtein.h
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 Fix the installation path for html documentation 2009-02-10 22:25:54 -08:00
match-trees.c
merge-file.c
merge-index.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
merge-recursive.c tree.c: allow read_tree_recursive() to traverse gitlink entries 2009-02-07 12:14:34 -08:00
merge-recursive.h
merge-tree.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
mktag.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
mktree.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
name-hash.c
object.c
object.h Merge branch 'js/maint-all-implies-HEAD' into maint 2009-02-05 17:54:12 -08:00
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 Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
patch-ids.c
patch-ids.h
path.c Revert "validate_headref: tighten ref-matching to just branches" 2009-02-12 13:02:09 -08:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Revert "Merge branch 'js/notes'" 2009-02-10 21:32:10 -08:00
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c add -u: do not fail to resolve a path as deleted 2009-01-28 17:29:33 -08:00
README
reflog-walk.c
reflog-walk.h
refs.c remote prune: warn dangling symrefs 2009-02-10 22:26:20 -08:00
refs.h remote prune: warn dangling symrefs 2009-02-10 22:26:20 -08:00
RelNotes Prepare for 1.6.1.4. 2009-02-11 18:44:03 -08:00
remote.c
remote.h
rerere.c Drop double-semicolon in C 2009-02-10 22:26:37 -08:00
rerere.h
revision.c Merge branch 'maint' 2009-02-11 02:00:22 -08:00
revision.h
run-command.c Merge branch 'jk/maint-cleanup-after-exec-failure' 2009-02-03 00:26:12 -08:00
run-command.h Merge branch 'jk/maint-cleanup-after-exec-failure' 2009-02-03 00:26:12 -08:00
send-pack.h
server-info.c
setup.c Merge branch 'js/maint-1.6.0-path-normalize' 2009-02-10 21:30:52 -08:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'maint' 2009-02-11 18:47:30 -08:00
sha1_name.c Squelch overzealous "ignoring dangling symref" in an empty repository 2009-02-11 09:22:16 -08:00
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
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 add test-dump-cache-tree in Makefile 2009-02-03 22:11:44 -08:00
test-genrandom.c
test-match-trees.c
test-parse-options.c
test-path-utils.c Test and fix normalize_path_copy() 2009-02-07 12:23:30 -08:00
test-sha1.c
test-sha1.sh
test-sigchain.c t0005: use SIGTERM for sigchain test 2009-01-30 01:14:26 -08:00
thread-utils.c
thread-utils.h
trace.c
transport.c
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c Drop double-semicolon in C 2009-02-10 22:26:37 -08:00
tree.h
unpack-file.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
unpack-trees.c Merge branch 'maint' 2009-01-31 17:42:26 -08:00
unpack-trees.h
update-server-info.c
upload-pack.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
usage.c
userdiff.c
userdiff.h
utf8.c utf8: add utf8_strwidth() 2009-02-04 16:30:43 -08:00
utf8.h utf8: add utf8_strwidth() 2009-02-04 16:30:43 -08:00
var.c
walker.c Drop double-semicolon in C 2009-02-10 22:26:37 -08:00
walker.h
wrapper.c
write_or_die.c
ws.c
wt-status.c
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 "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.