Documentation/git-push.txt: document when --signed may fail

Dave Borowitz committed about 11 years ago

Merge 'hv/submodule-config' to 'sb/submodule-helper'

Junio C Hamano committed about 11 years ago

submodule: allow erroneous values for the fetchRecurseSubmodules option

Heiko Voigt committed about 11 years ago

submodule: use new config API for worktree configurations

Heiko Voigt committed about 11 years ago

submodule: extract functions for config set and lookup

Heiko Voigt committed about 11 years ago

submodule: implement a config API for lookup of .gitmodules values

Heiko Voigt committed about 11 years ago

am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

Paul Tan committed about 11 years ago

untracked cache: fix entry invalidation

Nguyễn Thái Ngọc Duy committed about 11 years ago

untracked-cache: fix subdirectory handling

David Turner committed about 11 years ago

t7063: use --force-untracked-cache to speed up a bit

Nguyễn Thái Ngọc Duy committed about 11 years ago

notes: teach git-notes about notes.<name>.mergeStrategy option

Jacob Keller committed about 11 years ago

notes: add notes.mergeStrategy option to select default strategy

Jacob Keller committed about 11 years ago

notes: add tests for --commit/--abort/--strategy exclusivity

Jacob Keller committed about 11 years ago

notes: extract parse_notes_merge_strategy to notes-utils

Jacob Keller committed about 11 years ago

notes: extract enum notes_merge_strategy to notes-utils.h

Jacob Keller committed about 11 years ago

notes: document cat_sort_uniq rewriteMode

Jacob Keller committed about 11 years ago

Third batch for 2.6

Junio C Hamano committed about 11 years ago

Merge branch 'dt/untracked-sparse'

Junio C Hamano committed about 11 years ago

Merge branch 'ta/docfix-index-format-tech'

Junio C Hamano committed about 11 years ago

Merge branch 'mh/get-remote-group-fix'

Junio C Hamano committed about 11 years ago