summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* move identity config parsing to ident.cJeff King2012-05-223-23/+23
* fmt-merge-msg: don't use static buffer in record_personJeff King2012-05-221-4/+4
* http-push: do not access git_default_email directlyJeff King2012-05-221-1/+1
* ident: split setup_ident into separate functionsJeff King2012-05-222-16/+22
* Update draft release notes to 1.7.11 (11th batch)Junio C Hamano2012-05-111-13/+8
* Merge branch 'ef/checkout-empty'Junio C Hamano2012-05-112-1/+12
|\
| * checkout: do not corrupt HEAD on empty repoErik Faye-Lund2012-05-082-1/+12
* | Merge branch 'jk/maint-reflog-walk-count-vs-time'Junio C Hamano2012-05-117-16/+82
|\ \
| * | reflog-walk: tell explicit --date=default from not having --date at allJunio C Hamano2012-05-075-17/+15
| * | reflog-walk: always make HEAD@{0} show indexed selectorsJeff King2012-05-042-1/+10
| * | reflog-walk: clean up "flag" field of commit_reflog structJeff King2012-05-041-3/+12
| * | log: respect date_mode_explicit with --format:%gdJeff King2012-05-045-2/+7
| * | t1411: add more selector index/date testsJeff King2012-05-041-0/+45
* | | Merge branch 'nd/i18n-branch-lego'Junio C Hamano2012-05-111-9/+23
|\ \ \
| * | | branch: remove lego in i18n tracking info stringsNguyễn Thái Ngọc Duy2012-05-041-9/+23
* | | | Sync with 1.7.10.2Junio C Hamano2012-05-114-7/+22
|\ \ \ \
| * | | | Git 1.7.10.2v1.7.10.2Junio C Hamano2012-05-113-2/+17
| * | | | Merge branch 'jc/diff-algo-cleanup' into maintJunio C Hamano2012-05-118-25/+24
| |\ \ \ \
| * \ \ \ \ Merge branch 'ct/advise-push-default' into maintJunio C Hamano2012-05-1110-13/+99
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/fast-import-test-9300' into maintJunio C Hamano2012-05-111-34/+54
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/repack-no-explode-objects-from-old-pack' into maintJunio C Hamano2012-05-117-53/+107
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ah/maint-grep-double-init' into maintJunio C Hamano2012-05-111-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'fa/maint-config-doc' into maintJunio C Hamano2012-05-111-5/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/unpack-trees-leakfix' into maintJunio C Hamano2012-05-111-10/+17
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sl/test-wc-l-line-count' into maintJunio C Hamano2012-05-1119-74/+65
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rl/show-empty-prefix' into maintJunio C Hamano2012-05-112-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | document submdule.$name.update=none option for gitmodulesHeiko Voigt2012-05-112-6/+6
* | | | | | | | | | | | | | The tenth batch of topicsJunio C Hamano2012-05-101-14/+24
* | | | | | | | | | | | | | Merge branch 'rs/dir-strbuf'Junio C Hamano2012-05-101-39/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/maint-dir-strbuf' into rs/dir-strbufJunio C Hamano2012-05-081-39/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | dir: convert to strbufRené Scharfe2012-05-081-39/+36
* | | | | | | | | | | | | | | | Merge branch 'nd/i18n-apply-lego'Junio C Hamano2012-05-101-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | apply: remove lego in i18n string in gitdiff_verify_nameNguyễn Thái Ngọc Duy2012-05-081-4/+11
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'jk/status-porcelain-z-b'Junio C Hamano2012-05-105-95/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | status: refactor colopts handlingJeff King2012-05-082-6/+5
| * | | | | | | | | | | | | | | | Merge branch 'jk/maint-status-porcelain-z-b' into HEADJeff King2012-05-085-89/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | status: respect "-b" for porcelain formatJeff King2012-05-085-11/+16
| | * | | | | | | | | | | | | | | status: fix null termination with "-b"Jeff King2012-05-082-3/+13
| | * | | | | | | | | | | | | | | status: refactor null_termination optionJeff King2012-05-083-24/+24
| | * | | | | | | | | | | | | | | commit: refactor option parsingJeff King2012-05-081-58/+59
* | | | | | | | | | | | | | | | | Merge branch 'fa/maint-config-doc'Junio C Hamano2012-05-101-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Documentation/git-config: describe and clarify "--local <file>" optionFlorian Achleitner2012-05-071-5/+9
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ef/maint-clone-progress-fix'Junio C Hamano2012-05-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ef/maint-1.7.6-clone-progress-fix' into ef/maint-clone-progress...Junio C Hamano2012-05-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | clone: fix progress-regressionErik Faye-Lund2012-05-071-1/+1
| | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'ah/maint-grep-double-init'Junio C Hamano2012-05-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | grep.c: remove redundant line of codeAngus Hammond2012-05-071-1/+1
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'js/checkout-detach-count'Junio C Hamano2012-05-102-11/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | checkout (detached): truncate list of orphaned commits at the new HEADJohannes Sixt2012-05-042-7/+8
| * | | | | | | | | | | | | | | | t2020-checkout-detach: check for the number of orphaned commitsJohannes Sixt2012-05-041-5/+16