Documentation: warn prominently against merging with dirty trees

Thomas Rast committed almost 17 years ago

Documentation/git-merge: reword references to "remote" and "pull"

Thomas Rast committed almost 17 years ago

ls-files: fix overeager pathspec optimization

Junio C Hamano committed almost 17 years ago

read_directory(): further split treat_path()

Junio C Hamano committed almost 17 years ago

read_directory_recursive(): refactor handling of a single path into a separate function

Junio C Hamano committed almost 17 years ago

t3001: test ls-files -o ignored/dir

Junio C Hamano committed almost 17 years ago

ident.c: remove unused variables

Junio C Hamano committed almost 17 years ago

Describe second batch for 1.7.0 in draft release notes

Junio C Hamano committed almost 17 years ago

Merge branch 'js/filter-branch-prime'

Junio C Hamano committed almost 17 years ago

Merge branch 'sb/maint-octopus'

Junio C Hamano committed almost 17 years ago

Merge branch 'mg/tag-d-show'

Junio C Hamano committed almost 17 years ago

Merge branch 'so/cvsserver-update'

Junio C Hamano committed almost 17 years ago

Merge branch 'bg/maint-add-all-doc'

Junio C Hamano committed almost 17 years ago

git-rm doc: Describe how to sync index & work tree

Björn Gustavsson committed almost 17 years ago

Merge branch 'mv/commit-date'

Junio C Hamano committed almost 17 years ago

Merge branch 'mo/bin-wrappers'

Junio C Hamano committed almost 17 years ago

read-tree --debug-unpack

Junio C Hamano committed about 17 years ago

unpack-trees.c: look ahead in the index

Junio C Hamano committed about 17 years ago

unpack-trees.c: prepare for looking ahead in the index

Junio C Hamano committed almost 17 years ago

rebase -i: teach --onto A...B syntax

Nanako Shiraishi committed almost 17 years ago