git/git-rebase.sh, branch v1.6.4

Merge branch 'sb/quiet-porcelains'

2009-07-02T02:40:50Z

* 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

am, rebase: teach quiet option

2009-06-18T18:54:48Z

git-am and git-rebase are talkative scripts. Teach them to be quiet when told, allowing them to speak only when they fail or experience errors. The quiet option is maintained when git-am or git-rebase fails to apply a patch. This means subsequent --resolved, --continue, --skip, --abort invocations will be quiet if the original invocation was quiet. Drop a handful of >&2 redirection; the rest of the program sends all the info messages to stdout, not to stderr. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

pull, rebase: simplify to use die()

2009-06-15T04:14:10Z

Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano

rebase: fix typo (force_rebas -> force-rebas)

2009-03-27T21:26:34Z

Signed-off-by: Michele Ballabio Signed-off-by: Junio C Hamano

rebase: add options passed to git-am

2009-03-19T02:25:01Z

Add the options --committer-date-is-author-date and --ignore-date to git-rebase. They were introduced in commit a79ec62d0 for git-am. These options imply --force-rebase. Signed-off-by: Michele Ballabio Signed-off-by: Junio C Hamano

Merge branch 'tv/rebase-stat'

2009-03-11T20:49:11Z

* 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

Merge branch 'sr/force-rebase'

2009-03-05T23:41:40Z

* sr/force-rebase: Teach rebase to rebase even if upstream is up to date

git-rebase: Add --stat and --no-stat for producing diffstat on rebase

2009-03-03T07:22:32Z

The behavior of --verbose is unchanged, but uses a different state variable internally, so that the meaning of verbose output may be expanded without affecting the diffstat. This is also reflected in the documentation. The configuration option rebase.stat works the same was as merg.stat, but the default is currently false. Signed-off-by: Tor Arne Vestbø Signed-off-by: Junio C Hamano

disallow providing multiple upstream branches to rebase, pull --rebase

2009-02-18T19:14:04Z

It does not make sense to provide multiple upstream branches to either git pull --rebase, or to git rebase, so disallow both. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano

Teach rebase to rebase even if upstream is up to date

2009-02-14T01:17:47Z

Normally, if the current branch is up to date, the rebase is aborted. However, it may be desirable to allow rebasing even if the current branch is up to date. When using the '--whitespace=fix' option -f is implied. Signed-off-by: Sverre Rabbelier Signed-off-by: Junio C Hamano