diff options
Diffstat (limited to 'Documentation')
43 files changed, 43 insertions, 43 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index e010a16493..719e924980 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -162,7 +162,7 @@ linkgit:git-apply[1]. Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index 34b24a3cad..fba374d652 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -190,7 +190,7 @@ linkgit:git-annotate[1] AUTHOR ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> GIT --- diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index fc5a4a602f..6103d62fe3 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -205,7 +205,7 @@ but different purposes: Author ------ -Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net> +Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt index abe1f1b7dd..2b821f2a1d 100644 --- a/Documentation/git-check-attr.txt +++ b/Documentation/git-check-attr.txt @@ -30,7 +30,7 @@ linkgit:gitattributes[5]. Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 50fb3d5d54..837fb08b79 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -74,7 +74,7 @@ effect to your index in a row. Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index d761a73423..74d14c4e7f 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -64,7 +64,7 @@ linkgit:git-patch-id[1] Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 01bd2d6b77..0e25bb8627 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -331,7 +331,7 @@ linkgit:git-commit-tree[1] Author ------ Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net> +Junio C Hamano <gitster@pobox.com> GIT diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt index c069cc8b04..75a8da1ca9 100644 --- a/Documentation/git-count-objects.txt +++ b/Documentation/git-count-objects.txt @@ -27,7 +27,7 @@ OPTIONS Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt index 44b166888a..7fdda04bae 100644 --- a/Documentation/git-describe.txt +++ b/Documentation/git-describe.txt @@ -136,7 +136,7 @@ will be the smallest number of commits possible. Author ------ Written by Linus Torvalds <torvalds@osdl.org>, but somewhat -butchered by Junio C Hamano <junkio@cox.net>. Later significantly +butchered by Junio C Hamano <gitster@pobox.com>. Later significantly updated by Shawn Pearce <spearce@spearce.org>. Documentation diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 9e048a8a28..d3164c5c88 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -45,7 +45,7 @@ linkgit:git-pull[1] Author ------ Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net> +Junio C Hamano <gitster@pobox.com> Documentation ------------- diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 885edf005a..1c24796d66 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/git-fmt-merge-msg.txt @@ -61,7 +61,7 @@ linkgit:git-merge[1] Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 7c2ff3eb2d..010d9e4322 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -235,7 +235,7 @@ linkgit:git-am[1], linkgit:git-send-email[1] Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt index 9e654fc41c..ac928e198e 100644 --- a/Documentation/git-hash-object.txt +++ b/Documentation/git-hash-object.txt @@ -37,7 +37,7 @@ OPTIONS Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt index 4f252441ed..abe7bf9ff9 100644 --- a/Documentation/git-ls-remote.txt +++ b/Documentation/git-ls-remote.txt @@ -69,7 +69,7 @@ EXAMPLES Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> GIT --- diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt index 1cdec222a1..d7e73f568d 100644 --- a/Documentation/git-ls-tree.txt +++ b/Documentation/git-ls-tree.txt @@ -81,7 +81,7 @@ with minimum width of 7 characters. Object size is given only for blobs Author ------ Written by Petr Baudis <pasky@suse.cz> -Completely rewritten from scratch by Junio C Hamano <junkio@cox.net>, +Completely rewritten from scratch by Junio C Hamano <gitster@pobox.com>, another major rewrite by Linus Torvalds <torvalds@osdl.org> Documentation diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index 316bcc6796..31eccea5bc 100644 --- a/Documentation/git-mailinfo.txt +++ b/Documentation/git-mailinfo.txt @@ -60,7 +60,7 @@ conversion, even with this flag. Author ------ Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net> +Junio C Hamano <gitster@pobox.com> Documentation diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt index acd712b1cd..5cc94ec53d 100644 --- a/Documentation/git-mailsplit.txt +++ b/Documentation/git-mailsplit.txt @@ -46,7 +46,7 @@ OPTIONS Author ------ Written by Linus Torvalds <torvalds@osdl.org> -and Junio C Hamano <junkio@cox.net> +and Junio C Hamano <gitster@pobox.com> Documentation diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index 1dd134538d..dc8a96adb0 100644 --- a/Documentation/git-merge-one-file.txt +++ b/Documentation/git-merge-one-file.txt @@ -18,7 +18,7 @@ to resolve a merge after the trivial merge done with 'git-read-tree -m'. Author ------ Written by Linus Torvalds <torvalds@osdl.org>, -Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>. +Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>. Documentation -------------- diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index a7487d3dfd..2db8880989 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -145,7 +145,7 @@ linkgit:git-mergetool[1] Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt index 0be32e2612..af19f06ed7 100644 --- a/Documentation/git-mktree.txt +++ b/Documentation/git-mktree.txt @@ -23,7 +23,7 @@ OPTIONS Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-peek-remote.txt b/Documentation/git-peek-remote.txt index 79c03ee7f7..8282a5e82b 100644 --- a/Documentation/git-peek-remote.txt +++ b/Documentation/git-peek-remote.txt @@ -39,7 +39,7 @@ OPTIONS Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 092d1b8a3e..7578623edb 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -193,7 +193,7 @@ linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1] Author ------ Written by Linus Torvalds <torvalds@osdl.org> -and Junio C Hamano <junkio@cox.net> +and Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index c44dce374a..94d07ab812 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -195,7 +195,7 @@ git push origin master:refs/heads/experimental:: Author ------ -Written by Junio C Hamano <junkio@cox.net>, later rewritten in C +Written by Junio C Hamano <gitster@pobox.com>, later rewritten in C by Linus Torvalds <torvalds@osdl.org> Documentation diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 51afc87e17..58a5c746ba 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -398,7 +398,7 @@ after each commit, test, and amend the commit if fixes are necessary. Authors ------ -Written by Junio C Hamano <junkio@cox.net> and +Written by Junio C Hamano <gitster@pobox.com> and Johannes E. Schindelin <johannes.schindelin@gmx.de> Documentation diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt index 146d7f545c..d99236e14d 100644 --- a/Documentation/git-reflog.txt +++ b/Documentation/git-reflog.txt @@ -94,7 +94,7 @@ them. Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-request-pull.txt b/Documentation/git-request-pull.txt index ca6843032a..19335fddae 100644 --- a/Documentation/git-request-pull.txt +++ b/Documentation/git-request-pull.txt @@ -28,7 +28,7 @@ OPTIONS Author ------ -Written by Ryan Anderson <ryan@michonline.com> and Junio C Hamano <junkio@cox.net> +Written by Ryan Anderson <ryan@michonline.com> and Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 678bfd3cde..beebd5301f 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -204,7 +204,7 @@ conflict. Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> GIT --- diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index c8d175768c..6abaeac28c 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -195,7 +195,7 @@ $ git add frotz.c <3> Author ------ -Written by Junio C Hamano <junkio@cox.net> and Linus Torvalds <torvalds@osdl.org> +Written by Junio C Hamano <gitster@pobox.com> and Linus Torvalds <torvalds@osdl.org> Documentation -------------- diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 088f971b79..5c936693d3 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -426,7 +426,7 @@ but if $REV is empty, the commit object name from master will be printed. Author ------ Written by Linus Torvalds <torvalds@osdl.org> . -Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.org> +Junio C Hamano <gitster@pobox.com> and Pierre Habouzit <madcoder@debian.org> Documentation -------------- diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index 271850f511..98cfa3c0d0 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.txt @@ -61,7 +61,7 @@ effect to your index in a row. Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index 14e10362b1..d3f258869f 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -182,7 +182,7 @@ topologically related with each other. Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt index e0b52bcb37..1642cfd823 100644 --- a/Documentation/git-show.txt +++ b/Documentation/git-show.txt @@ -71,7 +71,7 @@ include::i18n.txt[] Author ------ Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net>. Significantly enhanced by +Junio C Hamano <gitster@pobox.com>. Significantly enhanced by Johannes Schindelin <Johannes.Schindelin@gmx.de>. diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 57b7498239..84f60f3407 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -64,7 +64,7 @@ linkgit:gitignore[5] Author ------ Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net>. +Junio C Hamano <gitster@pobox.com>. Documentation -------------- diff --git a/Documentation/git-symbolic-ref.txt b/Documentation/git-symbolic-ref.txt index 6266e6f658..210fde03a1 100644 --- a/Documentation/git-symbolic-ref.txt +++ b/Documentation/git-symbolic-ref.txt @@ -55,7 +55,7 @@ name is not a symbolic ref, or 128 if another error occurs. Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> GIT --- diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index b605e6caa2..b8dc88fa38 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -247,7 +247,7 @@ $ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1 Author ------ Written by Linus Torvalds <torvalds@osdl.org>, -Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>. +Junio C Hamano <gitster@pobox.com> and Chris Wright <chrisw@osdl.org>. Documentation -------------- diff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt index bc1207a317..35d27b0c7f 100644 --- a/Documentation/git-update-server-info.txt +++ b/Documentation/git-update-server-info.txt @@ -47,7 +47,7 @@ info/refs file unless `--force` flag is given. Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt index 53a9ce3085..c8611632d1 100644 --- a/Documentation/git-verify-pack.txt +++ b/Documentation/git-verify-pack.txt @@ -42,7 +42,7 @@ for objects that are deltified. Author ------ -Written by Junio C Hamano <junkio@cox.net> +Written by Junio C Hamano <gitster@pobox.com> Documentation -------------- diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt index d7fad15329..cadfbd9040 100644 --- a/Documentation/git-whatchanged.txt +++ b/Documentation/git-whatchanged.txt @@ -67,7 +67,7 @@ git whatchanged --since="2 weeks ago" \-- gitk:: Author ------ Written by Linus Torvalds <torvalds@osdl.org> and -Junio C Hamano <junkio@cox.net> +Junio C Hamano <gitster@pobox.com> Documentation diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt index 7a76045eb7..d214d4bf9d 100644 --- a/Documentation/howto/rebase-from-internal-branch.txt +++ b/Documentation/howto/rebase-from-internal-branch.txt @@ -1,4 +1,4 @@ -From: Junio C Hamano <junkio@cox.net> +From: Junio C Hamano <gitster@pobox.com> To: git@vger.kernel.org Cc: Petr Baudis <pasky@suse.cz>, Linus Torvalds <torvalds@osdl.org> Subject: Re: sending changesets from the middle of a git tree diff --git a/Documentation/howto/rebuild-from-update-hook.txt b/Documentation/howto/rebuild-from-update-hook.txt index 8d55dfbfae..48c67568d3 100644 --- a/Documentation/howto/rebuild-from-update-hook.txt +++ b/Documentation/howto/rebuild-from-update-hook.txt @@ -1,6 +1,6 @@ Subject: [HOWTO] Using post-update hook Message-ID: <7vy86o6usx.fsf@assigned-by-dhcp.cox.net> -From: Junio C Hamano <junkio@cox.net> +From: Junio C Hamano <gitster@pobox.com> Date: Fri, 26 Aug 2005 18:19:10 -0700 Abstract: In this how-to article, JC talks about how he uses the post-update hook to automate git documentation page diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt index 865a666324..e70d8a31e7 100644 --- a/Documentation/howto/revert-branch-rebase.txt +++ b/Documentation/howto/revert-branch-rebase.txt @@ -1,4 +1,4 @@ -From: Junio C Hamano <junkio@cox.net> +From: Junio C Hamano <gitster@pobox.com> To: git@vger.kernel.org Subject: [HOWTO] Reverting an existing commit Abstract: In this article, JC gives a small real-life example of using diff --git a/Documentation/howto/separating-topic-branches.txt b/Documentation/howto/separating-topic-branches.txt index 0d73b31224..6d3eb8ed00 100644 --- a/Documentation/howto/separating-topic-branches.txt +++ b/Documentation/howto/separating-topic-branches.txt @@ -1,4 +1,4 @@ -From: Junio C Hamano <junkio@cox.net> +From: Junio C Hamano <gitster@pobox.com> Subject: Separating topic branches Abstract: In this article, JC describes how to separate topic branches. diff --git a/Documentation/howto/update-hook-example.txt b/Documentation/howto/update-hook-example.txt index 8b2ec502f4..697d918885 100644 --- a/Documentation/howto/update-hook-example.txt +++ b/Documentation/howto/update-hook-example.txt @@ -1,4 +1,4 @@ -From: Junio C Hamano <junkio@cox.net> and Carl Baldwin <cnb@fc.hp.com> +From: Junio C Hamano <gitster@pobox.com> and Carl Baldwin <cnb@fc.hp.com> Subject: control access to branches. Date: Thu, 17 Nov 2005 23:55:32 -0800 Message-ID: <7vfypumlu3.fsf@assigned-by-dhcp.cox.net> |