diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2006-12-28 02:34:48 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-28 01:05:15 -0800 |
| commit | f94741324e26af42093a89e955ff9a923abff951 (patch) | |
| tree | 0beeca333111820b6af3705435ccb837f7793e20 /Documentation/git-merge.txt | |
| parent | b1f5f64fc831eb9f90bd07dc708279a921410bb2 (diff) | |
| download | git-f94741324e26af42093a89e955ff9a923abff951.tar.gz git-f94741324e26af42093a89e955ff9a923abff951.tar.xz | |
Use GIT_REFLOG_ACTION environment variable instead.
Junio rightly pointed out that the --reflog-action parameter
was starting to get out of control, as most porcelain code
needed to hand it to other porcelain and plumbing alike to
ensure the reflog contained the top-level user action and
not the lower-level actions it invoked.
At Junio's suggestion we are introducing the new set_reflog_action
function to all shell scripts, allowing them to declare early on
what their default reflog name should be, but this setting only
takes effect if the caller has not already set the GIT_REFLOG_ACTION
environment variable.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index e2954aa76..0f79665ea 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -10,7 +10,6 @@ SYNOPSIS -------- [verse] 'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]... - [--reflog-action=<action>] -m=<msg> <remote> <remote>... DESCRIPTION @@ -37,11 +36,6 @@ include::merge-options.txt[] least one <remote>. Specifying more than one <remote> obviously means you are trying an Octopus. ---reflog-action=<action>:: - This is used internally when `git-pull` calls this command - to record that the merge was created by `pull` command - in the `ref-log` entry that results from the merge. - include::merge-strategies.txt[] |