konrad-gibaszewski / git-when-merged

Determine when a particular commit was merged into a git branch

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

git when-merged [OPTIONS] COMMIT [BRANCH...]

Find when a commit was merged into one or more branches.  Find the merge
commit that brought COMMIT into the specified BRANCH(es).  Specificially, look
for the oldest commit on the first-parent history of BRANCH that contains the
COMMIT as an ancestor.

Options:
  -h, --help            show this help message and exit
  -p PATTERN, --pattern=PATTERN
                        Show when COMMIT was merged to the references matching
                        the specified regexp.  If the regexp has parentheses
                        for grouping, then display in the output the part of
                        the reference name matching the first group.
  -n NAME, --name=NAME  Show when COMMIT was merged to the references matching
                        the configured pattern(s) with the given name (see
                        whenmerged.<name>.pattern below under CONFIGURATION).
  -s, --default         Shorthand for "--name=default".
  --abbrev=N            Abbreviate commit SHA1s to the specified number of
                        characters (or more if needed to avoid ambiguity).
                        See also whenmerged.abbrev below under CONFIGURATION.
  --no-abbrev           Do not abbreviate commit SHA1s.
  -d, --diff            Show the diff for the merge commit.
  -v, --visualize       Visualize the merge commit using gitk.

  COMMIT
      a commit whose destiny you would like to determine (this
      argument is required)

  BRANCH...
      the destination branches into which <commit> might have been
      merged.  (Actually, BRANCH can be an arbitrary commit, specified
      in any way that is understood by git-rev-parse(1).) If neither
      <branch> nor -p/--pattern nor -s/--default is specified, then
      HEAD is used

Examples:
  git when-merged 0a1b                     # Find merge into current branch
  git when-merged 0a1b feature-1 feature-2 # Find merge into given branches
  git when-merged 0a1b -p feature-[0-9]+   # Specify branches by regex
  git when-merged 0a1b -n releases         # Use whenmerged.releases.pattern
  git when-merged 0a1b -s                  # Use whenmerged.default.pattern

  git when-merged 0a1b -d feature-1        # Show diff for each merge commit
  git when-merged 0a1b -v feature-1        # Display merge commit in gitk

Configuration:
  whenmerged.<name>.pattern
      Regular expressions that match reference names for the pattern
      called <name>.  A regexp is sought in the full reference name,
      in the form "refs/heads/master".  This option can be
      multivalued, in which case references matching any of the
      patterns are considered.  Typically you will use pattern(s) that
      match master and/or significant release branches, or perhaps
      their remote-tracking equivalents.  For example,

          git config whenmerged.default.pattern \
                  '^refs/heads/master$'

      or

          git config whenmerged.releases.pattern \
                  '^refs/remotes/origin/release\-\d+\.\d+$'

  whenmerged.abbrev
      If this value is set to a positive integer, then Git SHA1s are
      abbreviated to this number of characters (or longer if needed to
      avoid ambiguity).  This value can be overridden using --abbrev=N
      or --no-abbrev.

Based on:
  http://stackoverflow.com/questions/8475448/find-merge-commit-which-include-a-specific-commit

About

Determine when a particular commit was merged into a git branch

License:GNU General Public License v2.0


Languages

Language:Python 100.0%