Merge branch 'tr/merge-unborn-clobber'

Junio C Hamano committed over 15 years ago

Merge branch 'jc/unpack-trees'

Junio C Hamano committed over 15 years ago

Merge branch 'jc/fsck-fixes'

Junio C Hamano committed over 15 years ago

Merge branch 'tr/diff-words-test'

Junio C Hamano committed over 15 years ago

Merge branch 'rr/fi-import-marks-if-exists'

Junio C Hamano committed over 15 years ago

Merge branch 'jn/unpack-lstat-failure-report'

Junio C Hamano committed over 15 years ago

Merge branch 'ef/alias-via-run-command'

Junio C Hamano committed over 15 years ago

Merge branch 'cb/setup'

Junio C Hamano committed over 15 years ago

Merge branch 'ae/better-template-failure-report'

Junio C Hamano committed over 15 years ago

Merge branch 'jn/cherry-pick-strategy-option'

Junio C Hamano committed over 15 years ago

Merge branch 'maint-1.7.0' into maint

Junio C Hamano committed over 15 years ago

fast-import: introduce "feature notes" command

Jonathan Nieder committed over 15 years ago

fast-import: clarify documentation of "feature" command

Jonathan Nieder committed almost 16 years ago

Documentation/merge subtree How-To: fix typo

Uwe Kleine-König committed over 15 years ago

checkout: rearrange update_refs_for_switch for clarity

Jonathan Nieder committed over 15 years ago

checkout: introduce --detach synonym for "git checkout foo^{commit}"

Junio C Hamano committed over 15 years ago

checkout: split off a function to peel away branchname arg

Jonathan Nieder committed over 15 years ago

mingw_rmdir: set errno=ENOTEMPTY when appropriate

Johannes Schindelin committed over 15 years ago

mingw: add fallback for rmdir in case directory is in use

Heiko Voigt committed over 15 years ago

mingw: make failures to unlink or move raise a question

Heiko Voigt committed over 15 years ago