Merge branch 'jc/worktree-add-short-help'

Junio C Hamano committed over 8 years ago

Merge branch 'ab/sha1dc-build'

Junio C Hamano committed over 8 years ago

worktree: add: fix 'post-checkout' not knowing new worktree location

Eric Sunshine committed over 8 years ago

packfile: refactor hash search with fanout table

Jonathan Tan committed over 8 years ago

packfile: remove GIT_DEBUG_LOOKUP log statements

Jonathan Tan committed over 8 years ago

strbuf: add xstrdup_toupper()

Lars Schneider committed over 8 years ago

strbuf: remove unnecessary NUL assignment in xstrdup_tolower()

Lars Schneider committed over 8 years ago

apply: handle Subversion diffs with /dev/null gracefully

Tatyana Krasnukha committed over 8 years ago

apply: demonstrate a problem applying svn diffs

Johannes Schindelin committed over 8 years ago

Documentation/git-status: clarify status table for porcelain mode

Stefan Beller committed over 8 years ago

Makefile: generate Git(3pm) as dependency of the 'doc' and 'man' targets

SZEDER Gábor committed over 8 years ago

rev-parse: rename 'this' variable

Brandon Williams committed over 8 years ago

pack-objects: rename 'this' variables

Brandon Williams committed over 8 years ago

blame: rename 'this' variables

Brandon Williams committed over 8 years ago

object: rename function 'typename' to 'type_name'

Brandon Williams committed over 8 years ago

object_info: change member name from 'typename' to 'type_name'

Brandon Williams committed over 8 years ago

merge-recursive: when comparing files, don't include trees

Elijah Newren committed over 8 years ago

merge-recursive: check for file level conflicts then get new name

Elijah Newren committed over 8 years ago

merge-recursive: add computation of collisions due to dir rename & merging

Elijah Newren committed over 8 years ago

merge-recursive: check for directory level conflicts

Elijah Newren committed over 8 years ago