mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-08 10:13:18 +01:00
Code Activity
Mirror of https://github.com/git/git
16209 commits 6 branches 956 tags 504 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
Find a file
Miklos Vajna 668f26fff6 builtin-merge: refresh the index before calling a strategy 
In case a file is touched but has no real changes then we just have to
update the index and should not error out.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-03 08:01:46 -07:00
arm fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
compat mingw: remove use of _getdrive() from lstat/fstat 2008-09-29 08:55:47 -07:00
contrib Add OS X support to the pre-auto-gc example hook 2008-09-30 12:27:20 -07:00
Documentation run-command.c: remove run_command_v_opt_cd() 2008-10-02 18:02:44 -07:00
git-gui Merge git://repo.or.cz/git-gui 2008-09-25 08:41:07 -07:00
gitk-git Merge updated git-gui and gitk that call each other 2008-09-06 18:06:39 -07:00
gitweb Merge branch 'maint' 2008-10-02 18:16:22 -07:00
mozilla-sha1 fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
perl Git.pm: Use File::Temp->tempfile instead of ->new 2008-09-10 11:45:22 -07:00
ppc fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
t builtin-merge: refresh the index before calling a strategy 2008-10-03 08:01:46 -07:00
templates Fix permission bits on sources checked out with an overtight umask 2008-09-09 13:32:32 -07:00
xdiff xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less 2008-08-30 19:41:43 -07:00
.gitattributes git-gui: Use gitattribute "encoding" for file content display 2008-09-24 12:48:31 -07:00
.gitignore
.mailmap
abspath.c is_directory(): a generic helper function 2008-09-09 09:27:45 -07:00
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c archive.c: make archiver static 2008-10-02 18:03:35 -07:00
archive.h
attr.c
attr.h
base85.c
blob.c
blob.h
branch.c
branch.h
builtin-add.c Merge branch 'jc/add-addremove' 2008-08-27 16:39:57 -07:00
builtin-annotate.c
builtin-apply.c Merge branch 'bc/master-diff-hunk-header-fix' 2008-09-29 11:04:20 -07:00
builtin-archive.c Make git archive respect core.autocrlf when creating zip format archives 2008-09-18 19:49:28 -07:00
builtin-blame.c Merge branch 'maint' 2008-09-06 16:47:32 -07:00
builtin-branch.c
builtin-bundle.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-cat-file.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-check-attr.c
builtin-check-ref-format.c Start conforming code to "git subcmd" style 2008-08-30 13:50:48 -07:00
builtin-checkout-index.c Start conforming code to "git subcmd" style part 2 2008-09-09 08:41:29 -07:00
builtin-checkout.c Merge branch 'maint' into bc/master-diff-hunk-header-fix 2008-09-29 10:52:34 -07:00
builtin-clean.c
builtin-clone.c Merge branch 'jc/alternate-push' 2008-09-25 09:39:24 -07:00
builtin-commit-tree.c Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix 2008-09-18 20:32:50 -07:00
builtin-commit.c Merge branch 'bc/master-diff-hunk-header-fix' 2008-09-29 11:04:20 -07:00
builtin-config.c
builtin-count-objects.c Correct output of git-count-objects. 2008-09-08 14:25:43 -07:00
builtin-describe.c
builtin-diff-files.c diff/diff-files: do not use --cc too aggressively 2008-09-18 10:49:03 -07:00
builtin-diff-index.c diff*: fix worktree setup 2008-08-28 20:50:10 -07:00
builtin-diff-tree.c Fix git-diff-tree --stdin 2008-09-10 15:00:17 -07:00
builtin-diff.c Merge branch 'maint' 2008-09-18 20:30:12 -07:00
builtin-fast-export.c Fix a warning (on cygwin) to allow -Werror 2008-08-26 16:22:00 -07:00
builtin-fetch--tool.c
builtin-fetch-pack.c Merge branch 'jc/alternate-push' 2008-09-25 09:39:24 -07:00
builtin-fetch.c Start conforming code to "git subcmd" style part 2 2008-09-09 08:41:29 -07:00
builtin-fmt-merge-msg.c
builtin-for-each-ref.c Merge branch 'bc/master-diff-hunk-header-fix' 2008-09-29 11:04:20 -07:00
builtin-fsck.c
builtin-gc.c Use "git_config_string" to simplify "builtin-gc.c" code where "prune_expire" is set 2008-09-30 13:41:50 -07:00
builtin-grep.c Merge branch 'nd/worktree' into maint 2008-09-03 15:35:37 -07:00
builtin-help.c builtin-help: fallback to GIT_MAN_VIEWER before man 2008-08-29 21:46:33 -07:00
builtin-http-fetch.c Merge branch 'ho/dashless' 2008-09-09 22:57:35 -07:00
builtin-init-db.c Start conforming code to "git subcmd" style part 3 2008-09-15 23:11:35 -07:00
builtin-log.c Merge branch 'maint' into bc/master-diff-hunk-header-fix 2008-09-29 10:52:34 -07:00
builtin-ls-files.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
builtin-ls-remote.c
builtin-ls-tree.c
builtin-mailinfo.c mailinfo: avoid violating strbuf assertion 2008-08-19 19:36:56 -07:00
builtin-mailsplit.c
builtin-merge-base.c
builtin-merge-file.c merge.conflictstyle: choose between "merge" and "diff3 -m" styles 2008-08-30 19:41:44 -07:00
builtin-merge-ours.c
builtin-merge-recursive.c Merge branch 'maint' into bc/master-diff-hunk-header-fix 2008-09-29 10:52:34 -07:00
builtin-merge.c builtin-merge: refresh the index before calling a strategy 2008-10-03 08:01:46 -07:00
builtin-mv.c
builtin-name-rev.c
builtin-pack-objects.c Merge branch 'maint' 2008-09-23 02:05:35 -07:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c builtin-prune.c: prune temporary packs in <object_dir>/pack directory 2008-09-23 01:53:07 -07:00
builtin-push.c Make push more verbose about illegal combination of options 2008-08-17 00:24:21 -07:00
builtin-read-tree.c Merge branch 'jc/maint-checkout-keep-remove' into maint 2008-09-18 19:53:22 -07:00
builtin-receive-pack.c push: receiver end advertises refs from alternate repositories 2008-09-09 09:27:46 -07:00
builtin-reflog.c builtin-reflog: Allow reflog expire to name partial ref 2008-08-17 16:24:46 -07:00
builtin-remote.c Merge branch 'mg/maint-remote-fix' into maint 2008-09-29 09:39:53 -07:00
builtin-rerere.c
builtin-reset.c
builtin-rev-list.c Start conforming code to "git subcmd" style part 3 2008-09-15 23:11:35 -07:00
builtin-rev-parse.c
builtin-revert.c cherry-pick/revert: make direct internal call to merge_tree() 2008-09-02 17:03:01 -07:00
builtin-rm.c Use remove_path from dir.c instead of own implementation 2008-09-29 08:37:07 -07:00
builtin-send-pack.c Merge branch 'jc/alternate-push' 2008-09-25 09:39:24 -07:00
builtin-shortlog.c
builtin-show-branch.c
builtin-show-ref.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
builtin-stripspace.c
builtin-symbolic-ref.c
builtin-tag.c
builtin-tar-tree.c Cosmetical command name fix 2008-09-15 23:11:35 -07:00
builtin-unpack-objects.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
builtin-update-index.c Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix 2008-09-18 20:32:50 -07:00
builtin-update-ref.c
builtin-upload-archive.c
builtin-verify-pack.c discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
builtin-verify-tag.c
builtin-write-tree.c
builtin.h Merge branch 'jc/alternate-push' 2008-09-25 09:39:24 -07:00
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
combine-diff.c Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix 2008-09-18 20:32:50 -07:00
command-list.txt
commit.c commit.c: make read_graft_file() static 2008-10-02 18:03:35 -07:00
commit.h commit.c: make read_graft_file() static 2008-10-02 18:03:35 -07:00
config.c config.c: make git_parse_long() static 2008-10-02 18:03:35 -07:00
config.mak.in Merge branch 'jc/cc-ld-dynpath' 2008-09-07 23:45:56 -07:00
configure.ac configure: auto detect dynamic library path switches 2008-08-17 17:42:02 -07:00
connect.c push: prepare sender to receive extended ref information from the receiver 2008-09-09 09:27:46 -07:00
convert.c
copy.c
COPYING
csum-file.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
csum-file.h fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
ctype.c dir.c: Avoid c99 array initialization 2008-08-28 21:49:51 -07:00
daemon.c Merge branch 'jc/alternate-push' 2008-09-25 09:39:24 -07:00
date.c
decorate.c decorate: allow const objects to be decorated 2008-08-20 13:30:49 -07:00
decorate.h decorate: allow const objects to be decorated 2008-08-20 13:30:49 -07:00
delta.h
diff-delta.c
diff-lib.c diff: vary default prefix depending on what are compared 2008-08-30 20:53:24 -07:00
diff-no-index.c diff: vary default prefix depending on what are compared 2008-08-30 20:53:24 -07:00
diff.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
diff.h Merge branch 'ho/dirstat-by-file' 2008-09-25 08:41:42 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h Bust the ghost of long-defunct diffcore-pathspec. 2008-09-19 19:48:30 -07:00
dir.c dir.c: make dir_add_name() and dir_add_ignored() static 2008-10-02 17:46:09 -07:00
dir.h dir.c: make dir_add_name() and dir_add_ignored() static 2008-10-02 17:46:09 -07:00
dump-cache-tree.c
editor.c
entry.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl
git-am.sh git-am: ignore --binary option 2008-08-16 02:32:36 -07:00
git-archimport.perl
git-bisect.sh bisect: remove "checkout_done" variable used when checking merge bases 2008-09-05 22:31:43 -07:00
git-compat-util.h usage.c: remove unused functions 2008-09-29 07:30:16 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-filter-branch.sh Merge branch 'tr/filter-branch' 2008-09-02 17:47:13 -07:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool.sh
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--interactive.sh git-rebase--interactive: auto amend only edited commit 2008-09-09 08:57:21 -07:00
git-rebase.sh Improve error output of git-rebase 2008-08-16 23:21:18 -07:00
git-relink.perl
git-repack.sh git-repack uses --no-repack-object, not --no-repack-delta. 2008-09-19 22:23:14 -07:00
git-request-pull.sh
git-send-email.perl
git-sh-setup.sh
git-stash.sh Clarify how the user can satisfy stash's 'dirty state' check. 2008-09-29 08:13:10 -07:00
git-submodule.sh Merge branch 'bc/master-diff-hunk-header-fix' 2008-09-29 11:04:20 -07:00
git-svn.perl Merge branch 'maint' 2008-09-30 14:14:09 -07:00
GIT-VERSION-GEN GIT 1.6.0.2 2008-09-12 16:18:47 -07:00
git-web--browse.sh git-web--browse: Support for using /bin/start on MinGW 2008-09-24 15:49:21 -07:00
git.c Merge branch 'jc/alternate-push' 2008-09-25 09:39:24 -07:00
git.spec.in Update RPM spec for the new location of git-cvsserver. 2008-09-15 21:03:59 -07:00
graph.c graph.c: make many functions static 2008-09-25 08:00:28 -07:00
graph.h graph.c: make many functions static 2008-09-25 08:00:28 -07:00
grep.c log --author/--committer: really match only with name part 2008-09-04 22:21:56 -07:00
grep.h log --author/--committer: really match only with name part 2008-09-04 22:21:56 -07:00
hash-object.c
hash.c
hash.h
help.c git wrapper: also use aliases to correct mistyped commands 2008-09-11 23:05:39 -07:00
help.h Merge branch 'ar/autospell' 2008-09-07 23:52:16 -07:00
http-push.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
http-walker.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
http.c Merge branch 'mh/maint-honor-no-ssl-verify' 2008-09-16 00:46:36 -07:00
http.h
ident.c
imap-send.c
index-pack.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
INSTALL separate build targets for man and html documentation 2008-09-10 15:41:51 -07:00
interpolate.c
interpolate.h
levenshtein.c git wrapper: DWIM mistyped commands 2008-08-31 10:14:58 -07:00
levenshtein.h git wrapper: DWIM mistyped commands 2008-08-31 10:14:58 -07:00
list-objects.c
list-objects.h
ll-merge.c git-merge-recursive: learn to honor merge.conflictstyle 2008-08-30 19:41:44 -07:00
ll-merge.h
lockfile.c
log-tree.c move load_ref_decorations() to log-tree.c and export it 2008-09-04 17:01:41 -07:00
log-tree.h move load_ref_decorations() to log-tree.c and export it 2008-09-04 17:01:41 -07:00
mailmap.c
mailmap.h
Makefile Merge branch 'maint' 2008-10-02 18:16:22 -07:00
match-trees.c
merge-file.c
merge-index.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
merge-recursive.c Merge branch 'bc/master-diff-hunk-header-fix' 2008-09-29 11:04:20 -07:00
merge-recursive.h merge-recursive: move current_{file,directory}_set to struct merge_options 2008-09-04 22:50:43 -07:00
merge-tree.c
mktag.c
mktree.c
name-hash.c
object.c
object.h Fix git-diff-tree --stdin 2008-09-10 15:00:17 -07:00
pack-check.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
pack-redundant.c
pack-refs.c
pack-refs.h
pack-revindex.c discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
pack-revindex.h discard revindex data when pack list changes 2008-08-22 22:00:22 -07:00
pack-write.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
pack.h improve reliability of fixup_pack_header_footer() 2008-08-29 21:51:27 -07:00
pager.c
parse-options.c
parse-options.h
patch-delta.c
patch-id.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
patch-ids.c
patch-ids.h
path.c
pkt-line.c
pkt-line.h
pretty.c add '%d' pretty format specifier to show decoration 2008-09-04 17:01:41 -07:00
progress.c
progress.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
README
reflog-walk.c
reflog-walk.h
refs.c refs: improve comments about "reading" argument of "resolve_ref" 2008-09-09 08:34:00 -07:00
refs.h
RelNotes Start draft release notes for 1.6.0.3 2008-09-19 23:15:13 -07:00
remote.c remote.c: make free_ref(), parse_push_refspec() and free_refspecs() static. 2008-09-25 08:00:28 -07:00
remote.h remote.c: make free_ref(), parse_push_refspec() and free_refspecs() static. 2008-09-25 08:00:28 -07:00
rerere.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
rerere.h
revision.c Merge branch 'tr/rev-list-reverse' 2008-09-18 20:18:37 -07:00
revision.h Merge branch 'tr/rev-list-reverse' 2008-09-18 20:18:37 -07:00
run-command.c run-command.c: remove run_command_v_opt_cd() 2008-10-02 18:02:44 -07:00
run-command.h run-command.c: remove run_command_v_opt_cd() 2008-10-02 18:02:44 -07:00
send-pack.h
server-info.c
setup.c setup_git_directory(): fix move to worktree toplevel directory 2008-08-30 23:41:12 -07:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
sha1_name.c Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}' 2008-08-21 23:30:17 -07:00
shallow.c
shell.c shell: do not play duplicated definition games to shrink the executable 2008-08-29 22:38:41 -07:00
shortlog.h
show-index.c
sideband.c improve handling of sideband message display 2008-09-03 14:51:10 -07:00
sideband.h
strbuf.c
strbuf.h
string-list.c
string-list.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-date.c
test-delta.c
test-genrandom.c
test-match-trees.c
test-parse-options.c
test-path-utils.c
test-sha1.c fix openssl headers conflicting with custom SHA1 implementations 2008-10-02 18:06:56 -07:00
test-sha1.sh
thread-utils.c
thread-utils.h
trace.c
transport.c push: prepare sender to receive extended ref information from the receiver 2008-09-09 09:27:46 -07:00
transport.h
tree-diff.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unpack-file.c
unpack-trees.c checkout: do not lose staged removal 2008-09-09 22:55:22 -07:00
unpack-trees.h checkout: do not lose staged removal 2008-09-09 22:55:22 -07:00
update-server-info.c
upload-pack.c 'git foo' program identifies itself without dash in die() messages 2008-08-31 09:39:19 -07:00
usage.c usage.c: remove unused functions 2008-09-29 07:30:16 -07:00
utf8.c
utf8.h
var.c
walker.c
walker.h
wrapper.c
write_or_die.c
ws.c
wt-status.c wt-status: Teach how to discard changes in the working directory 2008-09-07 16:12:20 -07:00
wt-status.h
xdiff-interface.c Merge branch 'bc/master-diff-hunk-header-fix' 2008-09-29 11:04:20 -07:00
xdiff-interface.h Merge branch 'bc/master-diff-hunk-header-fix' 2008-09-29 11:04:20 -07:00

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.