A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Johannes Schindelin 9840906026 filter-branch: fix behaviour of '-k'
The option '-k' says that the given commit and _all_ of its ancestors
are kept as-is.

However, if a to-be-rewritten commit branched from an ancestor of an
ancestor of a commit given with '-k', filter-branch would fail.

Example:

	A - B
	  \
	    C

If filter-branch was called with '-k B -s C', it would actually keep
B (and A as its parent), but would rewrite C, and its parent.

Noticed by Johannes Sixt.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-06-06 12:49:16 -07:00
Documentation Update to SubmittingPatches 2007-06-02 20:02:15 -07:00
arm Fix an unmatched comment end in arm/sha1_arm.S 2007-05-12 09:16:50 -07:00
compat
contrib Allow contrib new-workdir to link into bare repositories 2007-05-29 00:27:21 -07:00
git-gui Merge branch 'maint' of git://repo.or.cz/git-gui into maint 2007-05-28 20:23:10 -07:00
gitweb gitweb.perl - Optionally send archives as .zip files 2007-05-23 15:09:49 -07:00
mozilla-sha1
perl Git.pm: config_boolean() -> config_bool() 2007-05-10 14:13:29 -07:00
ppc
t filter-branch: fix behaviour of '-k' 2007-06-06 12:49:16 -07:00
templates Have sample update hook not refuse deleting a branch through push. 2007-04-16 01:35:39 -07:00
xdiff xdiff/xutils.c(xdl_hash_record): factor out whitespace handling 2007-03-19 22:17:25 -07:00
.gitignore Merge branches 'lh/submodules' and 'pb/am' 2007-06-02 19:04:54 -07:00
.mailmap Add DLH to .mailmap 2007-05-30 10:45:55 -07:00
COPYING
GIT-VERSION-GEN GIT 1.5.2.1 2007-06-02 16:02:49 -07:00
INSTALL
Makefile Add git-filter-branch 2007-06-02 20:04:04 -07:00
README Update README to point at a few key periodical messages to the list 2007-03-25 17:42:32 -07:00
RelNotes Release Notes: start preparing for 1.5.3 2007-06-02 19:34:54 -07:00
alloc.c Clean up object creation to use more common code 2007-04-16 23:36:16 -07:00
archive-tar.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
archive-zip.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
archive.h
attr.c Fix crash in t0020 (crlf conversion) 2007-04-22 10:44:56 -07:00
attr.h Fix funny types used in attribute value representation 2007-04-18 16:17:13 -07:00
base85.c decode_85(): fix missing return. 2007-05-30 15:03:50 -07:00
blob.c Clean up object creation to use more common code 2007-04-16 23:36:16 -07:00
blob.h
builtin-add.c git-add: allow path limiting with -u 2007-05-12 01:01:28 -07:00
builtin-annotate.c
builtin-apply.c git-apply: what is detected and fixed is not just trailing spaces. 2007-06-02 20:02:19 -07:00
builtin-archive.c connect: display connection progress 2007-05-16 12:48:18 -07:00
builtin-blame.c Merge branch 'maint' 2007-05-06 00:21:03 -07:00
builtin-branch.c Merge branch 'maint' 2007-05-20 19:58:03 -07:00
builtin-bundle.c Ensure return value from xread() is always stored into an ssize_t 2007-05-15 21:16:03 -07:00
builtin-cat-file.c Cleanup variables in cat-file 2007-04-22 00:43:24 -07:00
builtin-check-attr.c Fix funny types used in attribute value representation 2007-04-18 16:17:13 -07:00
builtin-check-ref-format.c
builtin-checkout-index.c _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file. 2007-04-03 23:44:32 -07:00
builtin-commit-tree.c init_buffer(): Kill buf pointer 2007-04-25 13:45:12 -07:00
builtin-config.c Update git-config documentation 2007-04-18 22:08:16 -07:00
builtin-count-objects.c Simplify index access condition in count-objects, pack-redundant 2007-05-29 23:30:11 -07:00
builtin-describe.c Teach git-describe how to run name-rev 2007-05-21 23:56:28 -07:00
builtin-diff-files.c Removing -n option from git-diff-files documentation 2007-04-26 22:43:10 -07:00
builtin-diff-index.c Allow git-diff exit with codes similar to diff(1) 2007-03-14 16:21:19 -07:00
builtin-diff-tree.c Allow git-diff exit with codes similar to diff(1) 2007-03-14 16:21:19 -07:00
builtin-diff.c Diff between two blobs should take mode changes into account now. 2007-04-24 00:08:49 -07:00
builtin-fetch--tool.c Merge branch 'sv/checkout' 2007-05-20 02:18:47 -07:00
builtin-fmt-merge-msg.c
builtin-for-each-ref.c
builtin-fsck.c Ensure the pack index is opened before access 2007-05-29 23:31:06 -07:00
builtin-gc.c Make "git gc" pack all refs by default 2007-05-24 19:05:39 -07:00
builtin-grep.c sscanf/strtoul: parse integers robustly 2007-04-14 19:47:20 -07:00
builtin-init-db.c
builtin-log.c Merge branch 'maint' 2007-05-14 18:50:01 -07:00
builtin-ls-files.c Fix some "git ls-files -o" fallout from gitlinks 2007-04-14 17:42:58 -07:00
builtin-ls-tree.c Merge branch 'jn/lstree' 2007-05-23 00:17:47 -07:00
builtin-mailinfo.c git-mailinfo fixes for patch munging 2007-03-31 00:59:19 -07:00
builtin-mailsplit.c mailsplit: fix for more than one input files 2007-05-29 00:27:06 -07:00
builtin-merge-base.c
builtin-merge-file.c
builtin-mv.c Merge branch 'jc/index-output' 2007-04-07 02:26:24 -07:00
builtin-name-rev.c Merge branch 'maint' 2007-05-24 21:35:29 -07:00
builtin-pack-objects.c fix repack with --max-pack-size 2007-05-30 23:32:42 -07:00
builtin-pack-refs.c Make the pack-refs interfaces usable from outside 2007-05-26 20:00:55 -07:00
builtin-prune-packed.c
builtin-prune.c minor git-prune optimization 2007-03-20 22:17:47 -07:00
builtin-push.c Move refspec pattern matching to match_refs(). 2007-05-26 01:20:10 -07:00
builtin-read-tree.c Merge branch 'jc/read-tree-df' (early part) 2007-04-07 23:52:40 -07:00
builtin-reflog.c git-update-ref: add --no-deref option for overwriting/detaching ref 2007-05-10 15:24:44 -07:00
builtin-rerere.c rerere: make sorting really stable. 2007-04-04 14:12:03 -07:00
builtin-rev-list.c Add --date={local,relative,default} 2007-04-25 21:39:43 -07:00
builtin-rev-parse.c
builtin-revert.c Fix command line parameter parser of revert/cherry-pick 2007-05-23 00:17:51 -07:00
builtin-rm.c Add --ignore-unmatch option to exit with zero status when no files are removed. 2007-04-17 00:19:11 -07:00
builtin-runstatus.c
builtin-shortlog.c Remove pointless calls to access(2) when checking for .mailmap 2007-04-30 16:57:52 -07:00
builtin-show-branch.c
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c
builtin-tar-tree.c
builtin-unpack-objects.c Ensure return value from xread() is always stored into an ssize_t 2007-05-15 21:16:03 -07:00
builtin-update-index.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
builtin-update-ref.c git-update-ref: add --no-deref option for overwriting/detaching ref 2007-05-10 15:24:44 -07:00
builtin-upload-archive.c
builtin-verify-pack.c
builtin-write-tree.c Merge branch 'maint' 2007-04-25 23:31:45 -07:00
builtin.h Teach mailsplit about Maildir's 2007-05-24 19:01:56 -07:00
cache-tree.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
cache-tree.h
cache.h Merge branch 'sp/pack' 2007-06-02 12:18:51 -07:00
check-builtins.sh
check-racy.c
color.c
color.h
combine-diff.c Ensure return value from xread() is always stored into an ssize_t 2007-05-15 21:16:03 -07:00
commit.c Use =20 when rfc2047 encoding spaces. 2007-06-02 12:00:26 -07:00
commit.h Add --date={local,relative,default} 2007-04-25 21:39:43 -07:00
config.c Merge branch 'dh/pack' 2007-05-20 02:19:19 -07:00
config.mak.in Add --with-tcltk and --without-tcltk to configure. 2007-03-31 23:59:47 -07:00
configure.ac Eliminate checks of user-specified Tcl/Tk interpreter. 2007-03-31 23:59:47 -07:00
connect.c Merge branch 'db/remote' 2007-05-29 01:24:20 -07:00
convert-objects.c fix up strtoul_ui error handling 2007-04-18 19:26:33 -07:00
convert.c Fix mishandling of $Id$ expanded in the repository copy in convert.c 2007-05-26 01:12:43 -07:00
copy.c Ensure return value from xread() is always stored into an ssize_t 2007-05-15 21:16:03 -07:00
csum-file.c Alter sha1close() 3rd argument to request flush only 2007-05-20 21:55:26 -07:00
csum-file.h Custom compression levels for objects and packs 2007-05-10 15:23:09 -07:00
ctype.c
daemon.c git-daemon: don't ignore pid-file write failure 2007-05-21 18:34:14 -07:00
date.c Add --date={local,relative,default} 2007-04-25 21:39:43 -07:00
decorate.c Fix a copy-n-paste bug in the object decorator code. 2007-04-20 19:16:12 -07:00
decorate.h Add a generic "object decorator" interface, and make object refs use it 2007-04-16 16:51:09 -07:00
delta.h
diff-delta.c diff-delta: use realloc instead of xrealloc 2007-05-31 00:15:18 -07:00
diff-lib.c Merge branch 'lt/gitlink' 2007-04-21 17:21:10 -07:00
diff.c Merge branch 'maint' 2007-05-26 18:53:22 -07:00
diff.h Support 'diff=pgm' attribute 2007-04-22 22:16:14 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c diff -S: release the image after looking for needle in it 2007-05-07 15:54:32 -07:00
diffcore-rename.c diff -M: release the preimage candidate blobs after rename detection. 2007-05-07 15:54:32 -07:00
diffcore.h Make macros to prevent double-inclusion in headers consistent. 2007-04-29 02:05:11 -07:00
dir.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
dir.h rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
dump-cache-tree.c
entry.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
environment.c Merge branch 'dh/pack' 2007-05-20 02:19:19 -07:00
exec_cmd.c
exec_cmd.h Make macros to prevent double-inclusion in headers consistent. 2007-04-29 02:05:11 -07:00
fast-import.c Merge branch 'maint' 2007-05-23 22:37:23 -07:00
fetch-pack.c connect: display connection progress 2007-05-16 12:48:18 -07:00
fetch.c Initialize tree descriptors with a helper function rather than by hand. 2007-03-21 10:21:57 -07:00
fetch.h
generate-cmdlist.sh
git-add--interactive.perl
git-am.sh More echo "$user_message" fixes. 2007-05-26 00:33:03 -07:00
git-archimport.perl
git-bisect.sh Bisect: simplify "bisect start" logging. 2007-04-16 21:44:40 -07:00
git-checkout.sh checkout: allow detaching to HEAD even when switching to the tip of a branch 2007-05-12 12:35:54 -07:00
git-clean.sh Add clean.requireForce option, and add -f option to git-clean to override it 2007-04-23 22:13:50 -07:00
git-clone.sh Fix git-clone buglet for remote case. 2007-05-14 14:24:02 -07:00
git-commit.sh Merge branch 'maint-1.5.1' into maint 2007-05-26 01:30:40 -07:00
git-compat-util.h Merge branch 'maint' 2007-05-16 12:43:05 -07:00
git-cvsexportcommit.perl Add option to cvs update before export 2007-05-24 21:37:00 -07:00
git-cvsimport.perl Use git-for-each-ref to check whether the origin branch exists. 2007-05-23 11:06:38 -07:00
git-cvsserver.perl cvsserver: Handle 'cvs login' 2007-05-29 00:27:21 -07:00
git-fetch.sh Add another verbosity level to git-fetch 2007-05-24 21:37:03 -07:00
git-filter-branch.sh filter-branch: fix behaviour of '-k' 2007-06-06 12:49:16 -07:00
git-instaweb.sh
git-lost-found.sh Fix lost-found to show commits only referenced by reflogs 2007-04-05 15:00:03 -07:00
git-ls-remote.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-ours.sh Use diff* with --exit-code in git-am, git-rebase and git-merge-ours 2007-03-24 23:01:36 -07:00
git-merge-resolve.sh
git-merge-stupid.sh
git-merge.sh Merge branch 'ar/mergestat' 2007-05-29 00:38:52 -07:00
git-mergetool.sh mergetool: Clean up description of files and prompts for merge resolutions 2007-03-29 22:46:16 -04:00
git-p4import.py
git-parse-remote.sh Allow fetching references from any namespace 2007-05-12 09:36:06 -07:00
git-pull.sh Add a configuration option to control diffstat after merge 2007-05-24 21:37:08 -07:00
git-quiltimport.sh applymbox & quiltimport: typofix. 2007-04-24 14:27:41 -07:00
git-rebase.sh git-rebase: suggest to use git-add instead of git-update-index 2007-06-02 12:07:44 -07:00
git-relink.perl
git-remote.perl Git.pm: config_boolean() -> config_bool() 2007-05-10 14:13:29 -07:00
git-repack.sh Ensure git-repack -a -d --max-pack-size=N deletes correct packs 2007-05-24 19:45:14 -07:00
git-request-pull.sh Improve request-pull to handle non-rebased branches 2007-05-03 23:27:03 -07:00
git-reset.sh add file checkout progress 2007-04-23 21:39:28 -07:00
git-send-email.perl Merge branch 'maint' 2007-05-17 17:36:57 -07:00
git-sh-setup.sh
git-submodule.sh Add git-submodule command 2007-05-26 20:24:07 -07:00
git-svn.perl git-svn: avoid md5 calculation entirely if SVN doesn't provide one 2007-05-28 23:49:47 -07:00
git-svnimport.perl
git-tag.sh More echo "$user_message" fixes. 2007-05-26 00:33:03 -07:00
git-verify-tag.sh
git.c Merge branch 'maint-1.5.1' into maint 2007-05-20 19:57:00 -07:00
git.spec.in Merge branch 'maint' 2007-05-13 13:34:40 -07:00
gitk gitk: Allow user to choose whether to see the diff, old file, or new file 2007-04-19 11:39:12 +10:00
grep.c
grep.h
hash-object.c
help.c use xrealloc in help.c 2007-03-27 16:57:57 -07:00
http-fetch.c Fix lseek(2) calls with args 2 and 3 swapped 2007-04-05 15:39:12 -07:00
http-push.c Move refspec parser from connect.c and cache.h to remote.{c,h} 2007-05-20 21:32:56 -07:00
http.c http.c: Fix problem with repeated calls of http_init 2007-04-29 01:34:59 -07:00
http.h http-fetch: Disable use of curl multi support for libcurl < 7.16. 2007-05-03 22:12:40 -07:00
ident.c Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL 2007-04-29 02:05:06 -07:00
imap-send.c Ensure return value from xread() is always stored into an ssize_t 2007-05-15 21:16:03 -07:00
index-pack.c Ensure return value from xread() is always stored into an ssize_t 2007-05-15 21:16:03 -07:00
interpolate.c
interpolate.h
list-objects.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
list-objects.h
local-fetch.c [PATCH] local-fetch.c: some error printing cleanup 2007-03-16 21:27:35 -07:00
lockfile.c lockfile: record the primary process. 2007-04-21 11:55:23 -07:00
log-tree.c Merge branch 'maint' 2007-05-06 00:21:03 -07:00
log-tree.h
mailmap.c Include mailmap.h in mailmap.c to catch mailmap interface changes 2007-04-30 16:57:59 -07:00
mailmap.h Split out mailmap handling out of shortlog 2007-04-29 02:05:06 -07:00
match-trees.c A new merge stragety 'subtree'. 2007-04-07 02:29:40 -07:00
merge-file.c
merge-index.c Fix merge-index 2007-03-19 02:48:37 -07:00
merge-recursive.c Ignore merged status of the file-level merge 2007-04-26 16:11:39 -07:00
merge-tree.c Remove "pathlen" from "struct name_entry" 2007-03-21 10:21:56 -07:00
mktag.c
mktree.c
object-refs.c Add a generic "object decorator" interface, and make object refs use it 2007-04-16 16:51:09 -07:00
object.c Merge branch 'maint-1.5.1' into maint 2007-05-24 19:01:50 -07:00
object.h add add_object_array_with_mode 2007-04-24 00:08:49 -07:00
pack-check.c Lazily open pack index files on demand 2007-05-26 20:28:08 -07:00
pack-redundant.c Simplify index access condition in count-objects, pack-redundant 2007-05-29 23:30:11 -07:00
pack-write.c Fix signedness on return value from xread() 2007-05-15 21:15:54 -07:00
pack.h Create pack-write.c for common pack writing code 2007-05-02 13:24:18 -04:00
pager.c
patch-delta.c
patch-id.c
patch-ids.c Refactor patch-id filtering out of git-cherry and git-format-patch. 2007-04-11 20:02:03 -07:00
patch-ids.h Refactor patch-id filtering out of git-cherry and git-format-patch. 2007-04-11 20:02:03 -07:00
path-list.c
path-list.h Make macros to prevent double-inclusion in headers consistent. 2007-04-29 02:05:11 -07:00
path.c
peek-remote.c connect: display connection progress 2007-05-16 12:48:18 -07:00
pkt-line.c Ensure return value from xread() is always stored into an ssize_t 2007-05-15 21:16:03 -07:00
pkt-line.h
progress.c Fix the progress code to output LF only when it is really needed 2007-05-23 11:30:49 -07:00
progress.h Fix the progress code to output LF only when it is really needed 2007-05-23 11:30:49 -07:00
quote.c
quote.h
reachable.c Initialize tree descriptors with a helper function rather than by hand. 2007-03-21 10:21:57 -07:00
reachable.h
read-cache.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
receive-pack.c git-update-ref: add --no-deref option for overwriting/detaching ref 2007-05-10 15:24:44 -07:00
reflog-walk.c
reflog-walk.h
refs.c Move refspec pattern matching to match_refs(). 2007-05-26 01:20:10 -07:00
refs.h git-update-ref: add --no-deref option for overwriting/detaching ref 2007-05-10 15:24:44 -07:00
remote.c Move refspec pattern matching to match_refs(). 2007-05-26 01:20:10 -07:00
remote.h Add handlers for fetch-side configuration of remotes. 2007-05-20 21:32:56 -07:00
revision.c git-rev-list: Add regexp tuning options 2007-05-20 20:31:50 -07:00
revision.h Handle return code of parse_commit in revision machinery 2007-05-06 00:07:07 -07:00
rsh.c
rsh.h
run-command.c Allow environment variables to be unset in the processes started by run_command 2007-05-23 22:38:44 -07:00
run-command.h Allow environment variables to be unset in the processes started by run_command 2007-05-23 22:38:44 -07:00
send-pack.c Move refspec pattern matching to match_refs(). 2007-05-26 01:20:10 -07:00
server-info.c
setup.c Merge branch 'maint' 2007-03-10 22:07:26 -08:00
sha1_file.c Merge branch 'sp/pack' 2007-06-02 12:18:51 -07:00
sha1_name.c rev-parse: Identify short sha1 sums correctly. 2007-05-29 17:53:44 -07:00
shallow.c
shell.c
show-index.c show-index.c: learn about index v2 2007-04-10 12:48:14 -07:00
sideband.c
sideband.h
ssh-fetch.c
ssh-pull.c
ssh-push.c
ssh-upload.c Ensure return value from xread() is always stored into an ssize_t 2007-05-15 21:16:03 -07:00
strbuf.c
strbuf.h
symlinks.c Add has_symlink_leading_path() function. 2007-05-11 22:11:07 -07:00
tag.c Merge branch 'maint-1.5.1' into maint 2007-05-28 23:54:26 -07:00
tag.h
tar.h
test-chmtime.c
test-date.c
test-delta.c Fix compilation of test-delta 2007-05-01 02:59:08 -07:00
test-genrandom.c simple random data generator for tests 2007-04-11 19:23:32 -07:00
test-match-trees.c A new merge stragety 'subtree'. 2007-04-07 02:29:40 -07:00
test-sha1.c
test-sha1.sh
trace.c git-branch, git-checkout: autosetup for remote branch tracking 2007-03-10 23:41:58 -08:00
tree-diff.c tree_entry_interesting(): allow it to say "everything is interesting" 2007-03-22 00:36:00 -07:00
tree-walk.c Switch over tree descriptors to contain a pre-parsed entry 2007-03-21 11:15:26 -07:00
tree-walk.h Remove stale non-static-inline prototype for tree_entry_extract() 2007-05-13 11:57:00 -07:00
tree.c rename dirlink to gitlink. 2007-05-21 23:34:54 -07:00
tree.h
unpack-file.c
unpack-trees.c Merge branch 'maint-1.5.1' into maint 2007-05-20 19:57:00 -07:00
unpack-trees.h unpack-trees: get rid of *indpos parameter. 2007-04-04 00:19:28 -07:00
update-server-info.c
upload-pack.c git-upload-pack: make sure we close unused pipe ends 2007-03-29 01:41:23 -07:00
usage.c Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS 2007-03-31 01:11:11 -07:00
utf8.c wcwidth redeclaration 2007-05-07 22:02:40 -07:00
utf8.h
var.c
write_or_die.c
wt-status.c Merge branch 'maint-1.5.1' into maint 2007-05-21 18:42:35 -07:00
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.