Go to file
Jakub Narebski 6aa6f92fda gitweb: Add 'status_str' to parse_difftree_raw_line output
Add 'status_str' to diffinfo output, which stores status (also for
merge commit) as a string.  This allows for easy checking if there is
given status among all for merge commit, e.g.
  $diffinfo->{'status_str'} =~ /D/;

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-01 17:34:50 -07:00
Documentation Merge branch 'maint' 2007-11-01 17:09:08 -07:00
arm
compat Define compat version of mkdtemp for systems lacking it 2007-10-20 22:52:21 -04:00
contrib No longer install git-svnimport, move to contrib/examples 2007-10-30 21:36:29 -07:00
git-gui Merge branch 'maint' of git://repo.or.cz/git-gui into maint 2007-10-20 23:19:22 -04:00
gitweb gitweb: Add 'status_str' to parse_difftree_raw_line output 2007-11-01 17:34:50 -07:00
mozilla-sha1
perl
ppc
t Do no colorify test output if stdout is not a terminal 2007-11-01 15:37:34 -07:00
templates hooks-pre-commit: use \t, rather than a literal TAB in regexp 2007-10-26 23:16:51 -07:00
xdiff
.gitignore No longer install git-svnimport, move to contrib/examples 2007-10-30 21:36:29 -07:00
.mailmap RelNotes-1.5.4: describe recent updates 2007-10-29 13:33:38 -07:00
COPYING
GIT-VERSION-GEN GIT 1.5.3.5 2007-10-31 12:20:05 -07:00
INSTALL Mention 'cpio' dependency in INSTALL 2007-10-02 17:35:29 -07:00
Makefile Merge branch 'lt/rename' into HEAD 2007-10-30 21:38:00 -07:00
README
RelNotes Whip post 1.5.3.4 maintenance series into shape. 2007-10-15 22:29:50 -04:00
alloc.c
archive-tar.c Fix the expansion pattern of the pseudo-static path buffer. 2007-09-20 22:19:17 -07:00
archive-zip.c preserve executable bits in zip archives 2007-09-18 14:56:55 -07:00
archive.h
attr.c Merge branch 'maint' 2007-10-19 01:18:55 -04:00
attr.h
base85.c
blob.c
blob.h
builtin-add.c Merge branch 'kh/commit' 2007-10-31 23:53:22 -07:00
builtin-annotate.c
builtin-apply.c Correct some sizeof(size_t) != sizeof(unsigned long) typing errors 2007-10-22 00:00:40 -04:00
builtin-archive.c Merge branch 'js/forkexec' 2007-11-01 13:47:47 -07:00
builtin-blame.c Teach core.autocrlf to 'git blame' 2007-10-18 01:41:29 -04:00
builtin-branch.c Rework pretty_print_commit to use strbufs instead of custom buffers. 2007-09-10 12:49:50 -07:00
builtin-bundle.c Move bundle specific stuff into bundle.[ch] 2007-09-19 03:22:30 -07:00
builtin-cat-file.c
builtin-check-attr.c Full rework of quote_c_style and write_name_quoted. 2007-09-20 23:45:49 -07:00
builtin-check-ref-format.c
builtin-checkout-index.c Full rework of quote_c_style and write_name_quoted. 2007-09-20 23:45:49 -07:00
builtin-commit-tree.c Now that cache.h needs strbuf.h, remove useless includes. 2007-09-16 17:30:03 -07:00
builtin-config.c git-config: print error message if the config file cannot be read 2007-10-18 01:35:33 -04:00
builtin-count-objects.c
builtin-describe.c
builtin-diff-files.c
builtin-diff-index.c
builtin-diff-tree.c
builtin-diff.c
builtin-fetch--tool.c Improved const correctness for strings 2007-10-21 01:43:27 -04:00
builtin-fetch-pack.c Merge branch 'js/forkexec' 2007-11-01 13:47:47 -07:00
builtin-fetch.c git-fetch: do not fail when remote branch disappears 2007-10-28 14:06:39 -07:00
builtin-fmt-merge-msg.c Use xmemdupz() in many places. 2007-09-18 17:42:17 -07:00
builtin-for-each-ref.c Merge branch 'ph/strbuf' 2007-10-03 03:06:02 -07:00
builtin-fsck.c
builtin-gc.c git-gc: improve wording of --auto notification 2007-10-18 22:23:50 -04:00
builtin-grep.c Split grep arguments in a way that does not requires to add /dev/null. 2007-09-14 15:16:43 -07:00
builtin-http-fetch.c Modularize commit-walker 2007-09-19 03:22:30 -07:00
builtin-init-db.c
builtin-log.c Use xmemdupz() in many places. 2007-09-18 17:42:17 -07:00
builtin-ls-files.c Merge branch 'ph/strbuf' 2007-10-03 03:06:02 -07:00
builtin-ls-tree.c Full rework of quote_c_style and write_name_quoted. 2007-09-20 23:45:49 -07:00
builtin-mailinfo.c Improved const correctness for strings 2007-10-21 01:43:27 -04:00
builtin-mailsplit.c
builtin-merge-base.c
builtin-merge-file.c
builtin-mv.c Use xmemdupz() in many places. 2007-09-18 17:42:17 -07:00
builtin-name-rev.c
builtin-pack-objects.c Merge branch 'jc/autogc' 2007-10-03 03:05:32 -07:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c
builtin-push.c Fix 'push --all branch...' error handling 2007-10-16 00:25:56 -04:00
builtin-read-tree.c
builtin-reflog.c
builtin-rerere.c Export rerere() and launch_editor(). 2007-09-27 01:29:56 -07:00
builtin-reset.c Improved const correctness for strings 2007-10-21 01:43:27 -04:00
builtin-rev-list.c rev-list: implement --bisect-all 2007-10-26 23:27:23 -07:00
builtin-rev-parse.c
builtin-revert.c Merge branch 'maint' into HEAD 2007-10-30 21:44:43 -07:00
builtin-rm.c Simplify cache API 2007-09-14 01:02:21 -07:00
builtin-runstatus.c
builtin-shortlog.c Use xmemdupz() in many places. 2007-09-18 17:42:17 -07:00
builtin-show-branch.c Rework pretty_print_commit to use strbufs instead of custom buffers. 2007-09-10 12:49:50 -07:00
builtin-show-ref.c
builtin-stripspace.c Clean up stripspace a bit, use strbuf even more. 2007-09-27 00:33:33 -07:00
builtin-symbolic-ref.c
builtin-tag.c strbuf_read_file enhancement, and use it. 2007-09-29 21:26:10 -07:00
builtin-tar-tree.c
builtin-unpack-objects.c
builtin-update-index.c double free in builtin-update-index.c 2007-09-29 01:40:19 -07:00
builtin-update-ref.c
builtin-upload-archive.c
builtin-verify-pack.c
builtin-verify-tag.c
builtin-write-tree.c
builtin.h "git" returns 1; "git help" and "git help -a" return 0 2007-10-29 20:51:36 -07:00
bundle.c Move bundle specific stuff into bundle.[ch] 2007-09-19 03:22:30 -07:00
bundle.h Move bundle specific stuff into bundle.[ch] 2007-09-19 03:22:30 -07:00
cache-tree.c Small cache_tree_write refactor. 2007-09-26 02:27:06 -07:00
cache-tree.h Small cache_tree_write refactor. 2007-09-26 02:27:06 -07:00
cache.h Change git_connect() to return a struct child_process instead of a pid_t. 2007-10-21 01:30:39 -04:00
check-builtins.sh
check-racy.c
color.c Enable wt-status output to a given FILE pointer. 2007-09-19 12:52:19 -07:00
color.h Enable wt-status output to a given FILE pointer. 2007-09-19 12:52:19 -07:00
combine-diff.c Full rework of quote_c_style and write_name_quoted. 2007-09-20 23:45:49 -07:00
commit.c Merge branch 'maint' 2007-10-15 22:31:47 -04:00
commit.h Export rerere() and launch_editor(). 2007-09-27 01:29:56 -07:00
config.c
config.mak.in
configure.ac the ar tool is called gar on some systems 2007-10-02 21:10:25 -07:00
connect.c Use start_command() in git_connect() instead of explicit fork/exec. 2007-10-21 01:30:39 -04:00
convert.c Use the asyncronous function infrastructure to run the content filter. 2007-10-21 01:30:42 -04:00
copy.c
csum-file.c
csum-file.h
ctype.c
daemon.c Define NI_MAXSERV if not defined by operating system 2007-10-18 21:04:44 -04:00
date.c parse_date_format(): convert a format name to an enum date_mode 2007-09-29 20:31:59 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c diff --no-index: do not forget to run diff_setup_done() 2007-09-14 12:12:32 -07:00
diff.c Merge branch 'js/forkexec' 2007-11-01 13:47:47 -07:00
diff.h
diffcore-break.c Fix diffcore-break total breakage 2007-10-21 01:59:42 -04:00
diffcore-delta.c optimize diffcore-delta by sorting hash entries. 2007-10-04 00:05:36 -07:00
diffcore-order.c Use xmemdupz() in many places. 2007-09-18 17:42:17 -07:00
diffcore-pickaxe.c
diffcore-rename.c Do the fuzzy rename detection limits with the exact renames removed 2007-10-26 23:18:06 -07:00
diffcore.h copy vs rename detection: avoid unnecessary O(n*m) loops 2007-10-26 23:18:06 -07:00
dir.c Speedup scanning for excluded files. 2007-10-29 17:03:11 -07:00
dir.h Speedup scanning for excluded files. 2007-10-29 17:03:11 -07:00
dump-cache-tree.c
entry.c Correct some sizeof(size_t) != sizeof(unsigned long) typing errors 2007-10-22 00:00:40 -04:00
environment.c
exec_cmd.c use only the $PATH for exec'ing git commands 2007-10-29 20:51:37 -07:00
exec_cmd.h use only the $PATH for exec'ing git commands 2007-10-29 20:51:37 -07:00
fast-import.c fast-import.c: fix regression due to strbuf conversion 2007-10-26 15:28:09 -07:00
fetch-pack.h Always obtain fetch-pack arguments from struct fetch_pack_args 2007-09-19 03:22:31 -07:00
fixup-builtins
generate-cmdlist.sh
git-add--interactive.perl git add -i: Remove unused variables 2007-10-15 21:00:40 -04:00
git-am.sh Merge branch 'jc/am-quiet' 2007-10-18 03:45:05 -04:00
git-archimport.perl
git-bisect.sh Bisect: add "skip" to the short usage string. 2007-10-29 13:13:01 -07:00
git-checkout.sh post-checkout hook, tests, and docs 2007-09-29 21:11:21 -07:00
git-clean.sh Supplant the "while case ... break ;; esac" idiom 2007-09-23 16:12:00 -07:00
git-clone.sh honor the http.sslVerify option in shell scripts 2007-10-28 14:16:59 -07:00
git-commit.sh Merge branch 'jc/autogc' 2007-10-03 03:05:32 -07:00
git-compat-util.h Define compat version of mkdtemp for systems lacking it 2007-10-20 22:52:21 -04:00
git-cvsexportcommit.perl Merge branch 'bk/maint-cvsexportcommit' 2007-11-01 15:39:59 -07:00
git-cvsimport.perl
git-cvsserver.perl cvsserver: Use exit 1 instead of die when req_Root fails. 2007-10-18 03:02:15 -04:00
git-filter-branch.sh filter-branch: update current branch when rewritten 2007-10-16 22:47:51 -04:00
git-instaweb.sh Merge branch 'maint' 2007-10-16 23:32:03 -04:00
git-lost-found.sh
git-ls-remote.sh honor the http.sslVerify option in shell scripts 2007-10-28 14:16:59 -07:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-ours.sh
git-merge-resolve.sh
git-merge-stupid.sh
git-merge.sh Merge branch 'lh/merge' 2007-10-03 03:05:58 -07:00
git-mergetool.sh mergetool: avoid misleading message "Resetting to default..." 2007-10-18 19:59:58 -04:00
git-parse-remote.sh
git-pull.sh Teach git-pull about --[no-]ff, --no-squash and --commit 2007-10-29 13:32:52 -07:00
git-quiltimport.sh quiltimport: Skip non-existent patches 2007-09-27 16:19:19 -07:00
git-rebase--interactive.sh Merge branch 'maint' into HEAD 2007-10-30 21:44:43 -07:00
git-rebase.sh Fixing path quoting in git-rebase 2007-10-18 03:46:04 -04:00
git-relink.perl
git-remote.perl Merge branch 'maint' 2007-10-26 23:17:23 -07:00
git-repack.sh Merge branch 'jc/autogc' 2007-10-03 03:05:32 -07:00
git-request-pull.sh
git-send-email.perl git-send-email: add a new sendemail.to configuration variable 2007-10-24 20:13:07 -07:00
git-sh-setup.sh git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OK 2007-10-29 21:14:11 -07:00
git-stash.sh Paper bag fix diff invocation in 'git stash show' 2007-10-19 02:18:14 -04:00
git-submodule.sh Fix adding a submodule with a remote url 2007-09-29 23:36:02 -07:00
git-svn.perl git-svn: simplify the handling of fatal errors 2007-10-17 02:47:37 -04:00
git.c use only the $PATH for exec'ing git commands 2007-10-29 20:51:37 -07:00
git.spec.in
gitk gitk: Use the UI font for the diff/old version/new version radio buttons 2007-10-27 21:31:07 +10:00
grep.c
grep.h
hash-object.c
hash.c Do linear-time/space rename logic for exact renames 2007-10-26 23:18:06 -07:00
hash.h Do linear-time/space rename logic for exact renames 2007-10-26 23:18:06 -07:00
help.c include $PATH in generating list of commands for "help -a" 2007-10-29 20:51:37 -07:00
http-push.c Support 'push --dry-run' for http transport 2007-10-16 00:36:35 -04:00
http-walker.c Modularize commit-walker 2007-09-19 03:22:30 -07:00
http.c Properly cleanup in http_cleanup so builtin-fetch does not segfault 2007-09-19 03:22:31 -07:00
http.h Make function to refill http queue a callback 2007-09-19 03:22:30 -07:00
ident.c
imap-send.c strbuf change: be sure ->buf is never ever NULL. 2007-09-29 02:13:33 -07:00
index-pack.c
interpolate.c Merge branch 'mv/unknown' 2007-10-03 04:28:24 -07:00
interpolate.h
list-objects.c
list-objects.h
lockfile.c
log-tree.c rev-list: implement --bisect-all 2007-10-26 23:27:23 -07:00
log-tree.h rev-list: implement --bisect-all 2007-10-26 23:27:23 -07:00
mailmap.c
mailmap.h
match-trees.c Improved const correctness for strings 2007-10-21 01:43:27 -04:00
merge-file.c
merge-index.c
merge-recursive.c Make merge-recursive honor diff.renamelimit 2007-10-30 17:27:40 -07:00
merge-tree.c
mktag.c Now that cache.h needs strbuf.h, remove useless includes. 2007-09-16 17:30:03 -07:00
mktree.c Rework unquote_c_style to work on a strbuf. 2007-09-20 23:32:18 -07:00
object-refs.c
object.c
object.h
pack-check.c
pack-redundant.c
pack-write.c Refactor index-pack "keep $sha1" handling for reuse 2007-09-19 03:22:30 -07:00
pack.h Refactor index-pack "keep $sha1" handling for reuse 2007-09-19 03:22:30 -07:00
pager.c
patch-delta.c
patch-id.c
patch-ids.c
patch-ids.h
path-list.c
path-list.h
path.c
peek-remote.c Change git_connect() to return a struct child_process instead of a pid_t. 2007-10-21 01:30:39 -04:00
pkt-line.c
pkt-line.h
progress.c
progress.h
quote.c strbuf change: be sure ->buf is never ever NULL. 2007-09-29 02:13:33 -07:00
quote.h sq_quote_argv and add_to_string rework with strbuf's. 2007-09-21 03:31:18 -07:00
reachable.c
reachable.h
read-cache.c Merge branch 'maint' 2007-10-18 03:11:17 -04:00
receive-pack.c Merge branch 'db/fetch-pack' 2007-10-24 21:59:50 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'master' into db/fetch-pack 2007-10-16 00:15:25 -04:00
refs.h
remote.c Prevent send-pack from segfaulting (backport from 'master') 2007-10-30 16:21:56 -07:00
remote.h git-fetch: do not fail when remote branch disappears 2007-10-28 14:06:39 -07:00
revision.c Merge branch 'maint' 2007-10-15 22:31:47 -04:00
revision.h
run-command.c Add infrastructure to run a function asynchronously. 2007-10-21 01:30:41 -04:00
run-command.h Add infrastructure to run a function asynchronously. 2007-10-21 01:30:41 -04:00
send-pack.c Merge branch 'js/forkexec' 2007-11-01 13:47:47 -07:00
server-info.c
setup.c Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE 2007-10-16 20:18:04 -04:00
sha1_file.c Merge branch 'maint' 2007-10-29 12:53:54 -07:00
sha1_name.c
shallow.c
shell.c shell should call the new setup_path() to setup $PATH 2007-10-29 20:51:37 -07:00
show-index.c Use PRIuMAX instead of 'unsigned long long' in show-index 2007-10-21 02:16:57 -04:00
sideband.c
sideband.h
strbuf.c strbuf_read_file enhancement, and use it. 2007-09-29 21:26:10 -07:00
strbuf.h strbuf_read_file enhancement, and use it. 2007-09-29 21:26:10 -07:00
symlinks.c
tag.c Use xmemdupz() in many places. 2007-09-18 17:42:17 -07:00
tag.h
tar.h
test-absolute-path.c
test-chmtime.c
test-date.c
test-delta.c
test-genrandom.c
test-match-trees.c
test-sha1.c
test-sha1.sh
trace.c sq_quote_argv and add_to_string rework with strbuf's. 2007-09-21 03:31:18 -07:00
transport.c Change git_connect() to return a struct child_process instead of a pid_t. 2007-10-21 01:30:39 -04:00
transport.h Merge branch 'master' into db/fetch-pack 2007-10-16 00:15:25 -04:00
tree-diff.c Fix diffcore-break total breakage 2007-10-21 01:59:42 -04:00
tree-walk.c
tree-walk.h
tree.c
tree.h
unpack-file.c
unpack-trees.c
unpack-trees.h
update-server-info.c
upload-pack.c upload-pack: Run rev-list in an asynchronous function. 2007-10-21 01:30:42 -04:00
usage.c
utf8.c
utf8.h
var.c
walker.c Merge branch 'master' into db/fetch-pack 2007-10-16 00:15:25 -04:00
walker.h Modularize commit-walker 2007-09-19 03:22:30 -07:00
write_or_die.c
wt-status.c Enable wt-status to run against non-standard index file. 2007-09-19 12:52:19 -07:00
wt-status.h Enable wt-status to run against non-standard index file. 2007-09-19 12:52:19 -07:00
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.