Go to file
Marius Storm-Olsen 0925ce4d49 Add map_user() and clear_mailmap() to mailmap
map_user() allows to lookup and replace both email and
name of a user, based on a new style mailmap file.

The possible mailmap definitions are now:

  proper_name <commit_email>                             # Old style
  <proper_email> <commit_email>                          # New style
  proper_name <proper_email> <commit_email>              # New style
  proper_name <proper_email> commit_name <commit_email>  # New style

map_email() operates the same as before, with the
exception that it also will to try to match on a name
passed in through the name return buffer.

clear_mailmap() is needed to now clear the more complex
mailmap structure.

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-08 12:36:38 -08:00
Documentation Add map_user() and clear_mailmap() to mailmap 2009-02-08 12:36:38 -08:00
arm
compat Windows: Fix signal numbers 2009-01-21 22:46:52 -08:00
contrib contrib git-resurrect: find traces of a branch name and resurrect it 2009-02-04 15:07:49 -08:00
git-gui
gitk-git
gitweb gitweb: Update README that gitweb works better with PATH_INFO 2009-02-01 18:33:51 -08:00
mozilla-sha1
perl Merge branch 'pb/maint-git-pm-false-dir' into maint 2009-01-23 19:02:41 -08:00
ppc
t Add mailmap.file as configurational option for mailmap location 2009-02-08 12:36:26 -08:00
templates
xdiff Merge branch 'js/patience-diff' 2009-01-23 21:51:38 -08:00
.gitattributes
.gitignore Merge branch 'jk/signal-cleanup' 2009-01-31 17:43:56 -08:00
.mailmap
COPYING
GIT-VERSION-GEN GIT 1.6.1.2 2009-01-29 00:12:52 -08:00
INSTALL
Makefile Merge branch 'maint' 2009-02-04 00:12:19 -08:00
README
RelNotes GIT 1.6.1.2 2009-01-29 00:12:52 -08:00
abspath.c
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
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 'maint' 2009-02-04 00:12:19 -08:00
builtin-archive.c
builtin-blame.c Add mailmap.file as configurational option for mailmap location 2009-02-08 12:36:26 -08:00
builtin-branch.c Make has_commit() non-static 2009-01-28 11:33:03 -08:00
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 Merge branch 'jk/signal-cleanup' 2009-01-31 17:43:56 -08:00
builtin-commit-tree.c
builtin-commit.c Merge branch 'mh/maint-commit-color-status' into maint 2009-01-28 23:42:53 -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
builtin-fetch--tool.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
builtin-fetch-pack.c
builtin-fetch.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
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 Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX) 2009-01-26 00:26:05 -08:00
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
builtin-ls-remote.c
builtin-ls-tree.c
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' 2009-01-21 16:55:17 -08:00
builtin-pack-refs.c
builtin-prune-packed.c
builtin-prune.c
builtin-push.c
builtin-read-tree.c
builtin-receive-pack.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
builtin-reflog.c
builtin-remote.c
builtin-rerere.c
builtin-reset.c
builtin-rev-list.c
builtin-rev-parse.c
builtin-revert.c
builtin-rm.c
builtin-send-pack.c send-pack: do not send unknown object name from ".have" to pack-objects 2009-01-27 23:46:59 -08:00
builtin-shortlog.c Add mailmap.file as configurational option for mailmap location 2009-02-08 12:36:26 -08:00
builtin-show-branch.c
builtin-show-ref.c
builtin-stripspace.c
builtin-symbolic-ref.c
builtin-tag.c git-tag: Add --contains option 2009-01-28 11:33:51 -08:00
builtin-tar-tree.c
builtin-unpack-objects.c Merge branch 'lt/maint-wrap-zlib' 2009-01-21 16:55:17 -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 Merge branch 'js/maint-all-implies-HEAD' 2009-01-25 17:13:02 -08:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Add mailmap.file as configurational option for mailmap location 2009-02-08 12:36:26 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c Merge branch 'js/diff-color-words' 2009-01-25 17:13:29 -08:00
color.h Merge branch 'js/diff-color-words' 2009-01-25 17:13:29 -08:00
combine-diff.c
command-list.txt
commit.c Make has_commit() non-static 2009-01-28 11:33:03 -08:00
commit.h Make has_commit() non-static 2009-01-28 11:33:03 -08:00
config.c Add mailmap.file as configurational option for mailmap location 2009-02-08 12:36:26 -08:00
config.mak.in
configure.ac Fix naming scheme for configure cache variables. 2009-01-21 00:12:25 -08:00
connect.c
convert.c
copy.c
csum-file.c
csum-file.h
ctype.c Add is_regex_special() 2009-01-17 18:30:41 -08:00
daemon.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
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 Merge branch 'jc/maint-split-diff-metainfo' 2009-01-31 18:07:42 -08:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Rename detection: Avoid repeated filespec population 2009-01-21 00:14:12 -08:00
diffcore.h
dir.c Merge branch 'cb/add-pathspec' 2009-01-25 17:13:11 -08:00
dir.h
editor.c
entry.c Merge branch 'kb/lstat-cache' 2009-01-25 17:13:34 -08:00
environment.c
exec_cmd.c Compute prefix at runtime if RUNTIME_PREFIX is set 2009-01-26 00:26:05 -08:00
exec_cmd.h Refactor git_set_argv0_path() to git_extract_argv0_path() 2009-01-26 00:26:05 -08:00
fast-import.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
fetch-pack.h
fixup-builtins
fsck.c
fsck.h
generate-cmdlist.sh
git-add--interactive.perl add -p: trap Ctrl-D in 'goto' mode 2009-02-04 00:52:52 -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 Add is_regex_special() 2009-01-17 18:30:41 -08:00
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
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool.sh mergetool: Don't repeat merge tool candidates 2009-01-27 01:11:59 -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
git-relink.perl
git-repack.sh
git-request-pull.sh
git-send-email.perl
git-sh-setup.sh
git-stash.sh
git-submodule.sh
git-svn.perl git-svn: add --ignore-paths option for fetching 2009-01-25 17:01:47 -08:00
git-web--browse.sh
git.c Merge branch 'jk/maint-cleanup-after-exec-failure' 2009-02-03 00:26:12 -08:00
git.spec.in
graph.c
graph.h
grep.c Add is_regex_special() 2009-01-17 18:30:41 -08:00
grep.h
hash-object.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
hash.c
hash.h
help.c
help.h
http-push.c Merge branch 'sp/runtime-prefix' 2009-01-31 17:43:59 -08:00
http-walker.c Merge branch 'lt/maint-wrap-zlib' 2009-01-21 16:55:17 -08:00
http.c
http.h
ident.c
imap-send.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
index-pack.c Merge branch 'sp/runtime-prefix' 2009-01-31 17:43:59 -08:00
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
log-tree.c
log-tree.h
mailmap.c Add map_user() and clear_mailmap() to mailmap 2009-02-08 12:36:38 -08:00
mailmap.h Add map_user() and clear_mailmap() to mailmap 2009-02-08 12:36:38 -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
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 bundle: allow the same ref to be given more than once 2009-01-17 23:00:31 -08:00
object.h Merge branch 'js/maint-all-implies-HEAD' 2009-01-25 17:13:02 -08:00
pack-check.c
pack-redundant.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c pager: do wait_for_pager on signal death 2009-01-21 22:46:53 -08:00
parse-options.c Make opt_parse_with_commit() non-static 2009-01-28 11:32:27 -08:00
parse-options.h Make opt_parse_with_commit() non-static 2009-01-28 11:32:27 -08:00
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
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Add mailmap.file as configurational option for mailmap location 2009-02-08 12:36:26 -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
reflog-walk.c
reflog-walk.h
refs.c Introduce for_each_recent_reflog_ent(). 2009-01-19 22:18:29 -08:00
refs.h Introduce for_each_recent_reflog_ent(). 2009-01-19 22:18:29 -08:00
remote.c
remote.h
rerere.c
rerere.h
revision.c Merge branch 'jc/maint-allow-uninteresting-missing' 2009-01-31 18:08: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 'sg/maint-gitdir-in-subdir' 2009-01-21 16:51:25 -08:00
sha1-lookup.c
sha1-lookup.h
sha1_file.c Sync with 1.6.1.2 2009-01-29 00:32:52 -08:00
sha1_name.c Merge branch 'tr/previous-branch' 2009-01-28 15:00:27 -08:00
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
sigchain.h refactor signal handling for cleanup functions 2009-01-21 22:46:53 -08:00
strbuf.c
strbuf.h
string-list.c Add find_insert_index, insert_at_index and clear_func functions to string_list 2009-02-08 12:36:31 -08:00
string-list.h Add find_insert_index, insert_at_index and clear_func functions to string_list 2009-02-08 12:36:31 -08:00
symlinks.c lstat_cache(): introduce clear_lstat_cache() function 2009-01-18 13:58:34 -08:00
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c Add is_regex_special() 2009-01-17 18:30:41 -08:00
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-path-utils: Fix off by one, found by valgrind 2009-01-27 15:16:41 -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
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 Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
upload-pack.c Replace deprecated dashed git commands in usage 2009-02-04 15:08:49 -08:00
usage.c
userdiff.c Change the spelling of "wordregex". 2009-01-21 23:52:16 -08:00
userdiff.h
utf8.c
utf8.h
var.c Add calls to git_extract_argv0_path() in programs that call git_config_* 2009-01-26 00:26:05 -08:00
walker.c
walker.h
wrapper.c
write_or_die.c
ws.c
wt-status.c
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/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.