Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jul 16, 2012
  1. @gitster

    Merge branch 'cw/rebase-i-root'

    gitster authored
    "git rebase [-i] --root $tip" can now be used to rewrite all the
    history down to the root.
    
    * cw/rebase-i-root:
      t3404: make test 57 work with dash and others
      Add tests for rebase -i --root without --onto
      rebase -i: support --root without --onto
Commits on Jul 13, 2012
  1. @gitster

    Merge branch 'mz/rebase-no-mbox'

    gitster authored
    Teach "am --rebasing" codepath to grab authorship, log message and
    the patch text directly out of existing commits.  This will help
    rebasing commits that have confusing "diff" output in their log
    messages.
    
    * mz/rebase-no-mbox:
      am: don't call mailinfo if $rebasing
      am --rebasing: get patch body from commit, not from mailbox
      rebase --root: print usage on too many args
      rebase: don't source git-sh-setup twice
Commits on Jun 1, 2012
  1. @gitster

    Merge branch 'ef/maint-rebase-error-message'

    gitster authored
    By Erik Faye-Lund
    * ef/maint-rebase-error-message:
      rebase: report invalid commit correctly
Commits on Oct 18, 2011
  1. @gitster

    Merge branch 'jk/pull-rebase-with-work-tree'

    gitster authored
    * jk/pull-rebase-with-work-tree:
      pull,rebase: handle GIT_WORK_TREE better
    
    Conflicts:
    	git-pull.sh
Commits on Jul 22, 2011
  1. @gitster

    Merge branch 'mz/doc-rebase-abort'

    gitster authored
    * mz/doc-rebase-abort:
      rebase: clarify "restore the original branch"
Commits on Jul 13, 2011
  1. @gitster

    Merge branch 'js/rebase-typo-branch-squelch-usage'

    gitster authored
    * js/rebase-typo-branch-squelch-usage:
      rebase: do not print lots of usage hints after an obvious error message
Commits on Jan 27, 2011
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      rebase -i: clarify in-editor documentation of "exec"
      tests: sanitize more git environment variables
      fast-import: treat filemodify with empty tree as delete
      rebase: give a better error message for bogus branch
      rebase: use explicit "--" with checkout
    
    Conflicts:
    	t/t9300-fast-import.sh
Commits on Dec 14, 2010
  1. @gitster

    Merge branch 'mz/rebase-abort-reflog-fix' into maint

    gitster authored
    * mz/rebase-abort-reflog-fix:
      rebase --abort: do not update branch ref
  2. @gitster

    Merge branch 'mz/maint-rebase-stat-config' into maint

    gitster authored
    * mz/maint-rebase-stat-config:
      rebase: only show stat if configured to true
Commits on Dec 13, 2010
  1. @gitster

    Merge branch 'mz/rebase-i-verify'

    gitster authored
    * mz/rebase-i-verify:
      rebase: support --verify
  2. @gitster

    Merge branch 'mz/rebase-abort-reflog-fix'

    gitster authored
    * mz/rebase-abort-reflog-fix:
      rebase --abort: do not update branch ref
  3. @gitster

    Merge branch 'mz/maint-rebase-stat-config'

    gitster authored
    * mz/maint-rebase-stat-config:
      rebase: only show stat if configured to true
Commits on Nov 30, 2010
  1. @gitster

    Merge branch 'rr/needs-clean-work-tree'

    gitster authored
    * rr/needs-clean-work-tree:
      Porcelain scripts: Rewrite cryptic "needs update" error message
Commits on Oct 13, 2010
  1. @gitster

    shell portability: no "export VAR=VAL"

    gitster authored
    It is more portable to say "VAR=VAL && export VAR" instead.
    
    Noticed by Ævar.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 15, 2010
  1. @gitster

    Merge branch 'os/fix-rebase-diff-no-prefix'

    gitster authored
    * os/fix-rebase-diff-no-prefix:
      Add --src/dst-prefix to git-formt-patch in git-rebase.sh
Commits on Aug 20, 2010
  1. @gitster

    Merge branch 'jn/rebase-rename-am' into maint

    gitster authored
    * jn/rebase-rename-am:
      rebase: protect against diff.renames configuration
      t3400 (rebase): whitespace cleanup
      Teach "apply --index-info" to handle rename patches
      t4150 (am): futureproof against failing tests
      t4150 (am): style fix
Commits on Aug 18, 2010
  1. @gitster

    Merge branch 'ml/rebase-x-strategy'

    gitster authored
    * ml/rebase-x-strategy:
      rebase: support -X to pass through strategy options
  2. @gitster

    Merge branch 'jn/rebase-rename-am'

    gitster authored
    * jn/rebase-rename-am:
      rebase: protect against diff.renames configuration
      t3400 (rebase): whitespace cleanup
      Teach "apply --index-info" to handle rename patches
      t4150 (am): futureproof against failing tests
      t4150 (am): style fix
Commits on Jul 23, 2010
  1. @gitster

    rebase: protect against diff.renames configuration

    gitster authored
    We currently do not disable diff.renames configuration while rebase
    internally runs "format-patch" to feed "am -3".
    
    The end user configuration for "diff" should not affect the result
    produced by the higher level command that is related to "diff" only
    because internally it is implemented in terms of it.
    
    For that matter, I have a feeling that format-patch should not even look
    at diff.renames, but we seem to have been doing this for a long time so
    there is no easy way to fix this thinko.
    
    In any case, here is a much straightforward fix for "rebase".
    
    [jn: with test case from David]
    
    Reported-by: David D. Kilzer <ddkilzer@kilzer.net>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 3, 2010
  1. @gitster

    Merge branch 'mb/rebase-i-no-ff'

    gitster authored
    * mb/rebase-i-no-ff:
      Teach rebase the --no-ff option.
    
    Conflicts:
    	git-rebase--interactive.sh
    	t/t3404-rebase-interactive.sh
Commits on Mar 24, 2010
  1. @gitster

    Merge branch 'tr/notes-display'

    gitster authored
    * tr/notes-display:
      git-notes(1): add a section about the meaning of history
      notes: track whether notes_trees were changed at all
      notes: add shorthand --ref to override GIT_NOTES_REF
      commit --amend: copy notes to the new commit
      rebase: support automatic notes copying
      notes: implement helpers needed for note copying during rewrite
      notes: implement 'git notes copy --stdin'
      rebase -i: invoke post-rewrite hook
      rebase: invoke post-rewrite hook
      commit --amend: invoke post-rewrite hook
      Documentation: document post-rewrite hook
      Support showing notes from more than one notes tree
      test-lib: unset GIT_NOTES_REF to stop it from influencing tests
    
    Conflicts:
    	git-am.sh
    	refs.c
Commits on Jan 19, 2010
  1. @gitster

    Merge branch 'jc/rerere'

    gitster authored
    * jc/rerere:
      Teach --[no-]rerere-autoupdate option to merge, revert and friends
Commits on Jan 13, 2010
  1. @gitster

    Merge branch 'jc/checkout-merge-base'

    gitster authored
    * jc/checkout-merge-base:
      rebase -i: teach --onto A...B syntax
      rebase: fix --onto A...B parsing and add tests
      "rebase --onto A...B" replays history on the merge base between A and B
      "checkout A...B" switches to the merge base between A and B
Commits on Dec 4, 2009
  1. @gitster

    Teach --[no-]rerere-autoupdate option to merge, revert and friends

    gitster authored
    Introduce a command line option to override rerere.autoupdate configuration
    variable to make it more useful.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 25, 2009
  1. @gitster

    Merge branch 'rs/work-around-grep-opt-insanity'

    gitster authored
    * rs/work-around-grep-opt-insanity:
      Protect scripted Porcelains from GREP_OPTIONS insanity
      mergetool--lib: simplify guess_merge_tool()
    
    Conflicts:
    	git-instaweb.sh
Commits on Nov 24, 2009
  1. @gitster

    Protect scripted Porcelains from GREP_OPTIONS insanity

    gitster authored
    If the user has exported the GREP_OPTIONS environment variable, the output
    from "grep" and "egrep" in scripted Porcelains may be different from what
    they expect.  For example, we may want to count number of matching lines,
    by "grep" piped to "wc -l", and GREP_OPTIONS=-C3 will break such use.
    
    The approach taken by this change to address this issue is to protect only
    our own use of grep/egrep.  Because we do not unset it at the beginning of
    our scripts, hook scripts run from the scripted Porcelains are exposed to
    the same insanity this environment variable causes when grep/egrep is used
    to implement logic (e.g. "grep | wc -l"), and it is entirely up to the
    hook scripts to protect themselves.
    
    On the other hand, applypatch-msg hook may want to show offending words in
    the proposed commit log message using grep to the end user, and the user
    might want to set GREP_OPTIONS=--color to paint the match more visibly.
    The approach to protect only our own use without unsetting the environment
    variable globally will allow this use case.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 21, 2009
  1. @gitster

    "rebase --onto A...B" replays history on the merge base between A and B

    gitster authored
    This is in spirit similar to "checkout A...B".  To re-queue a new set of
    patches for a series that the original author prepared to apply on 'next'
    on the same base as before, you would do something like this:
    
        $ git checkout next^0
        $ git am -s rerolled-series.mbox
        $ git rebase --onto next...jh/notes next
    
    The first two commands recreates commits to be rebased as the original
    author intended (i.e. applies directly on top of 'next'), and the rebase
    command replays that history on top of the same commit the series being
    replaced was built on (which is typically much older than the tip of
    'next').
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 22, 2009
  1. @gitster

    Merge branch 'gb/apply-ignore-whitespace'

    gitster authored
    * gb/apply-ignore-whitespace:
      git apply: option to ignore whitespace differences
Commits on Jul 2, 2009
  1. @gitster

    Merge branch 'sb/quiet-porcelains'

    gitster authored
    * sb/quiet-porcelains:
      stash: teach quiet option
      am, rebase: teach quiet option
      submodule, repack: migrate to git-sh-setup's say()
      git-sh-setup: introduce say() for quiet options
      am: suppress apply errors when using 3-way
      t4150: test applying with a newline in subject
Commits on Mar 11, 2009
  1. @gitster

    Merge branch 'tv/rebase-stat'

    gitster authored
    * tv/rebase-stat:
      git-pull: Allow --stat and --no-stat to be used with --rebase
      git-rebase: Add --stat and --no-stat for producing diffstat on rebase
Commits on Mar 5, 2009
  1. @gitster

    Merge branch 'sr/force-rebase'

    gitster authored
    * sr/force-rebase:
      Teach rebase to rebase even if upstream is up to date
Commits on Oct 19, 2008
  1. @gitster

    Merge branch 'ae/preservemerge'

    gitster authored
    * ae/preservemerge:
      rebase: Support preserving merges in non-interactive mode
Commits on Jul 17, 2008
  1. @gitster

    Merge branch 'rs/rebase-checkout-not-so-quiet'

    gitster authored
    * rs/rebase-checkout-not-so-quiet:
      git-rebase: report checkout failure
    
    Conflicts:
    	git-rebase.sh
Commits on Jul 14, 2008
  1. @gitster

    git-rebase: report checkout failure

    gitster authored
    When detaching the HEAD to the base commit, the "git checkout" command
    could fail if, for example, upstream contains a file that would overrwrite
    a local, untracked file.  Unconditionally discarding the standard error
    stream was done to squelch the progress and notices back when checkout
    did not have -q option, but there is no reason to keep doing it anymore.
    
    Noticed by Robert Shearman.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 7, 2008
  1. @gitster

    Teach "am" and "rebase" to mark the original position with ORIG_HEAD

    gitster authored
    "merge" and "reset" leave the original point in history in ORIG_HEAD,
    which makes it easy to go back to where you were before you inflict a
    major damage to your history and realize that you do not like the result
    at all.  These days with reflog, we technically do not need to use
    ORIG_HEAD, but it is a handy way nevertheless.
    
    This teaches "am" and "rebase" (all forms --- the vanilla one that uses
    "am" as its backend, "-m" variant that cherry-picks, and "--interactive")
    to do the same.
    
    The original idea and a partial implementation to do this only for "rebase
    -m" was by Brian Gernhardt; this extends on his idea.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.