| commit | 0f6d62165f33012887d5874873a497f1769413a6 | |
| author | Stephan Beyer <s-beyer@gmx.net> | |
| Mon, 3 Aug 2009 01:55:27 +0000 (3 03:55 +0200) | ||
| committer | Stephan Beyer <s-beyer@gmx.net> | |
| Mon, 3 Aug 2009 02:00:51 +0000 (3 04:00 +0200) | ||
| tree | 93d0408dead3e16a4725e9a18bd68a358c63b9eb | treesnapshot (tar.gz zip) |
| parent | e7b8dab0c2a73ade92017a52bb1405ea1534ef20 | commitdiff |
| parent | e6580020057afd207b7cfb9c96905f99e13cfe4d | commitdiff |
Merge branch 'junio/master' into seq-builtin-dev
This merge is a lazy merge that drops
1) git-am.sh changes introduced by:
ea10b60c91 Work around ash "alternate value" expansion bug
47c9739e5e am: simplify "sq" function by using "git rev-parse --sq-quote"
a5a6755a1d git-am foreign patch support: introduce patch_format
15ced753ac git-am foreign patch support: autodetect some patch formats
c574e683b5 git-am foreign patch support: StGIT support
0cd29a0371 git-am: refactor 'cleaning up and aborting'
2) git-rebase--interactive.sh changes introduced by:
1830d9cb62 Fix rebase -p --onto
and this merge also does not
3) introduce the new OPT_FILENAME option to builtin-sequencer.
This merge is a lazy merge that drops
1) git-am.sh changes introduced by:
ea10b60c91 Work around ash "alternate value" expansion bug
47c9739e5e am: simplify "sq" function by using "git rev-parse --sq-quote"
a5a6755a1d git-am foreign patch support: introduce patch_format
15ced753ac git-am foreign patch support: autodetect some patch formats
c574e683b5 git-am foreign patch support: StGIT support
0cd29a0371 git-am: refactor 'cleaning up and aborting'
2) git-rebase--interactive.sh changes introduced by:
1830d9cb62 Fix rebase -p --onto
and this merge also does not
3) introduce the new OPT_FILENAME option to builtin-sequencer.
12 files changed: