Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'

Junio C Hamano committed almost 17 years ago

Merge branch 'nd/include-termios-for-osol'

Junio C Hamano committed almost 17 years ago

Merge branch 'js/windows'

Junio C Hamano committed almost 17 years ago

branch: warn and refuse to set a branch as a tracking branch of itself.

Matthieu Moy committed almost 17 years ago

Performance optimization for detection of modified submodules

Jens Lehmann committed almost 17 years ago

Add branch --set-upstream

Ilari Liusvaara committed almost 17 years ago

builtin-apply.c: fix the --- and +++ header filename consistency check

Andreas Gruenbacher committed almost 17 years ago

Add git remote set-url

Ilari Liusvaara committed almost 17 years ago

Replace parse_blob() with an explanatory comment

Daniel Barkalow committed almost 17 years ago

Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint

Junio C Hamano committed almost 17 years ago

grep: NUL terminate input from a file

Jim Meyering committed almost 17 years ago

builtin-apply.c: Skip filenames without enough components

Andreas Gruenbacher committed almost 17 years ago

symlinks.c: remove unused functions

Junio C Hamano committed almost 17 years ago

object.c: remove unused functions

Junio C Hamano committed almost 17 years ago

Document that merge strategies can now take their own options

Junio C Hamano committed over 18 years ago

Extend merge-subtree tests to test -Xsubtree=dir.

Avery Pennarun committed almost 17 years ago

Make "subtree" part more orthogonal to the rest of merge-recursive.

Junio C Hamano committed over 18 years ago

pull: Fix parsing of -X<option>

Junio C Hamano committed almost 17 years ago

Teach git-pull to pass -X<option> to git-merge

Avery Pennarun committed almost 17 years ago

git merge -X<option>

Avery Pennarun committed almost 17 years ago