summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-18 00:36:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-18 00:36:09 (GMT)
commitda68bf337664f6160d56153cfe4a38c49a5185f3 (patch)
tree974b093877cae20779493ae7843699abdbe2490a /ll-merge.c
parentca01600306863ecfa8bbef769b8e1386cb149785 (diff)
parent24c512803dadf61b2f7f8965735b7c3a03f6147e (diff)
downloadgit-da68bf337664f6160d56153cfe4a38c49a5185f3.zip
git-da68bf337664f6160d56153cfe4a38c49a5185f3.tar.gz
git-da68bf337664f6160d56153cfe4a38c49a5185f3.tar.bz2
Merge branch 'js/bisect-no-checkout'
* js/bisect-no-checkout: bisect: add support for bisecting bare repositories bisect: further style nitpicks bisect: replace "; then" with "\n<tab>*then" bisect: cleanup whitespace errors in git-bisect.sh. bisect: add documentation for --no-checkout option. bisect: add tests for the --no-checkout option. bisect: introduce --no-checkout support into porcelain. bisect: introduce support for --no-checkout option. bisect: add tests to document expected behaviour in presence of broken trees. bisect: use && to connect statements that are deferred with eval. bisect: move argument parsing before state modification.
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions