Skip to content

Commit

Permalink
git-applymbox: Remove command
Browse files Browse the repository at this point in the history
I believe noone uses git-applymbox, and noone definitely should, since it
is supposed to be completely superseded and everything by its younger
cousin git-am. The only known person in the universe to use it was Linus
and he declared some time ago that he will try to use git-am instead in his
famous dotest script.

The trouble is that git-applymbox existence creates confusing UI. I'm a bit
like a recycled newbie to the git porcelain and *I* was confused by
git-applymbox primitiveness until I've realized a while later that I'm of
course using the wrong command.

Signed-off-by: Petr Baudis <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
Petr Baudis authored and Junio C Hamano committed May 25, 2007
1 parent 18bece4 commit d45cc6e
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 228 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ git-add--interactive
git-am
git-annotate
git-apply
git-applymbox
git-applypatch
git-archimport
git-archive
Expand Down
1 change: 0 additions & 1 deletion Documentation/cmd-list.perl
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ sub format_one {
git-add mainporcelain
git-am mainporcelain
git-annotate ancillaryinterrogators
git-applymbox ancillaryinterrogators
git-applypatch purehelpers
git-apply plumbingmanipulators
git-archimport foreignscminterface
Expand Down
5 changes: 2 additions & 3 deletions Documentation/git-am.txt
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ is terminated before the first occurrence of such a line.

When initially invoking it, you give it names of the mailboxes
to crunch. Upon seeing the first patch that does not apply, it
aborts in the middle, just like 'git-applymbox' does. You can
recover from this in one of two ways:
aborts in the middle,. You can recover from this in one of two ways:

. skip the current patch by re-running the command with '--skip'
option.
Expand All @@ -146,7 +145,7 @@ names.

SEE ALSO
--------
gitlink:git-applymbox[1], gitlink:git-applypatch[1], gitlink:git-apply[1].
gitlink:git-applypatch[1], gitlink:git-apply[1].


Author
Expand Down
98 changes: 0 additions & 98 deletions Documentation/git-applymbox.txt

This file was deleted.

6 changes: 3 additions & 3 deletions Documentation/hooks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ applypatch-msg
--------------

This hook is invoked by `git-applypatch` script, which is
typically invoked by `git-applymbox`. It takes a single
typically invoked by `git-am`. It takes a single
parameter, the name of the file that holds the proposed commit
log message. Exiting with non-zero status causes
`git-applypatch` to abort before applying the patch.
Expand All @@ -30,7 +30,7 @@ pre-applypatch
--------------

This hook is invoked by `git-applypatch` script, which is
typically invoked by `git-applymbox`. It takes no parameter,
typically invoked by `git-am`. It takes no parameter,
and is invoked after the patch is applied, but before a commit
is made. Exiting with non-zero status causes the working tree
after application of the patch not committed.
Expand All @@ -45,7 +45,7 @@ post-applypatch
---------------

This hook is invoked by `git-applypatch` script, which is
typically invoked by `git-applymbox`. It takes no parameter,
typically invoked by `git-am`. It takes no parameter,
and is invoked after the patch is applied and a commit is made.

This hook is meant primarily for notification, and cannot affect
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ SCRIPT_SH = \
git-repack.sh git-request-pull.sh git-reset.sh \
git-sh-setup.sh \
git-tag.sh git-verify-tag.sh \
git-applymbox.sh git-applypatch.sh git-am.sh \
git-applypatch.sh git-am.sh \
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
git-merge-resolve.sh git-merge-ours.sh \
git-lost-found.sh git-quiltimport.sh
Expand Down
121 changes: 0 additions & 121 deletions git-applymbox.sh

This file was deleted.

0 comments on commit d45cc6e

Please sign in to comment.