diff options
| author |  Jeff King <peff@peff.net> | 2012-11-04 08:00:06 -0500 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-11-04 08:00:06 -0500 |
| commit | 4f101a6cf41da743e40e83d045455f8c180dde88 (patch) | |
| tree | 90aa39fdc1eba3261e2ed98efd5c37dec6005a82 /Documentation/asciidoc.conf | |
| parent | Merge branch 'mm/maint-doc-remote-tracking' (diff) | |
| parent | git-pull: Avoid merge-base on detached head (diff) | |
| download | tgif-4f101a6cf41da743e40e83d045455f8c180dde88.tar.xz | |
Merge branch 'ph/pull-rebase-detached'
Avoids spewing error messages when using "pull --rebase" on a
detached HEAD.
* ph/pull-rebase-detached:
git-pull: Avoid merge-base on detached head
Diffstat (limited to 'Documentation/asciidoc.conf')
0 files changed, 0 insertions, 0 deletions