delta/git.git, branch mo/subtree-split-updates

subtree: add --edit option

2013-12-10T22:43:10+00:00

Signed-off-by: Matthew Ogilvie 
Signed-off-by: Junio C Hamano

subtree: allow --squash and --message with push

2013-12-10T22:43:09+00:00

Signed-off-by: Matthew Ogilvie 
Signed-off-by: Junio C Hamano

subtree: support split --rejoin --squash

2013-12-10T22:43:09+00:00

Allow using --squash with "git subtree split --rejoin".  It
will still split off (and save to --branch) the complete
subtree history, but the merge done for the "--rejoin" will
be merging a squashed representation of the new subtree
commits, instead of the commits themselves (similar to
how "git subtree merge --squash" works).

Signed-off-by: Matthew Ogilvie 
Signed-off-by: Junio C Hamano

Merge git://repo.or.cz/git-gui

2013-12-09T22:57:00+00:00

* git://repo.or.cz/git-gui:
  git-gui: correct spelling errors in comments
  git-gui: add menu item to launch a bash shell on Windows.
  git-gui: corrected setup of git worktree under cygwin.
  git-gui: right half window is paned
  git-gui: Add gui.displayuntracked option
  git-gui: show the maxrecentrepo config option in the preferences dialog
  git-gui: added gui.maxrecentrepo to extend the number of remembered repos
  git-gui: Improve font rendering on retina macbooks

Merge git://ozlabs.org/~paulus/gitk

2013-12-09T22:55:41+00:00

* git://ozlabs.org/~paulus/gitk:
  gitk: Recognize -L option
  gitk: Support showing the gathered inline diffs
  gitk: Split out diff part in $commitinfo
  gitk: Refactor per-line part of getblobdiffline and its support
  gitk: Support -G option from the command line
  gitk: Tag display improvements

Start 1.9 cycle

2013-12-06T19:20:04+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jk/remove-experimental-loose-object-support'

2013-12-06T19:09:43+00:00

* jk/remove-experimental-loose-object-support:
  drop support for "experimental" loose objects

Merge branch 'nd/magic-pathspec'

2013-12-06T19:09:41+00:00

"git diff -- ':(icase)makefile'" were rejected unnecessarily.
This needs to be merged to 'maint' later.

* nd/magic-pathspec:
  diff: restrict pathspec limitations to diff b/f case only

Merge branch 'rr/for-each-ref-decoration'

2013-12-06T19:07:21+00:00

Add a few formatting directives to "git for-each-ref --format=...",
to paint them in color, etc.

* rr/for-each-ref-decoration:
  for-each-ref: avoid color leakage
  for-each-ref: introduce %(color:...) for color
  for-each-ref: introduce %(upstream:track[short])
  for-each-ref: introduce %(HEAD) asterisk marker
  t6300 (for-each-ref): don't hardcode SHA-1 hexes
  t6300 (for-each-ref): clearly demarcate setup

Merge branch 'jc/bundle'

2013-12-06T19:07:15+00:00

Code clean-up.

* jc/bundle:
  bundle: use argv-array