summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | The ninth batch of topics graduated to 'master'Junio C Hamano2012-05-071-50/+19
* | Merge branch 'nh/empty-rebase'Junio C Hamano2012-05-071-3/+11
|\ \
| * | git cherry-pick: do not dereference a potential NULL pointerNeil Horman2012-05-031-3/+11
* | | Merge branch 'zj/diff-empty-chmod'Junio C Hamano2012-05-072-34/+74
|\ \ \
| * | | t4006: Windows do not have /dev/zeroJohannes Sixt2012-05-021-1/+1
| * | | diff --stat: do not run diff on indentical filesZbigniew Jędrzejewski-Szmek2012-05-011-2/+5
| * | | diff --stat: report mode-only changes for binary files like text filesZbigniew Jędrzejewski-Szmek2012-05-012-22/+24
| * | | tests: check --[short]stat output after chmodZbigniew Jędrzejewski-Szmek2012-05-011-0/+37
| * | | test: modernize style of t4006Zbigniew Jędrzejewski-Szmek2012-05-011-16/+14
* | | | Merge branch 'jk/maint-tformat-with-z'Junio C Hamano2012-05-072-1/+29
|\ \ \ \
| * | | | log-tree: the previous one is still not quite rightJunio C Hamano2012-05-011-0/+16
| * | | | log-tree: use custom line terminator in line termination modeJan Krüger2012-05-012-1/+13
* | | | | Merge branch 'th/difftool-diffall'Junio C Hamano2012-05-074-87/+398
|\ \ \ \ \
| * | | | | difftool: print list of valid tools with '--tool-help'Tim Henigan2012-04-233-7/+64
| * | | | | difftool: teach difftool to handle directory diffsTim Henigan2012-04-234-27/+303
| * | | | | difftool: eliminate setup_environment functionTim Henigan2012-03-231-7/+2
| * | | | | difftool: stop appending '.exe' to gitTim Henigan2012-03-231-10/+1
| * | | | | difftool: remove explicit change of PATHTim Henigan2012-03-231-4/+0
| * | | | | difftool: exit(0) when usage is printedTim Henigan2012-03-231-4/+5
| * | | | | difftool: add '--no-gui' optionTim Henigan2012-03-232-3/+17
| * | | | | difftool: parse options using Getopt::LongTim Henigan2012-03-231-65/+46
* | | | | | Sync with maintJunio C Hamano2012-05-072-2/+49
|\ \ \ \ \ \
| * | | | | | Start preparing for 1.7.10.2Junio C Hamano2012-05-072-1/+47
| * | | | | | Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maintJunio C Hamano2012-05-073-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/daemon-test-race-fix' into maintJunio C Hamano2012-05-071-11/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-config-bogus-section' into maintJunio C Hamano2012-05-072-1/+31
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'pw/t5800-import-race-fix' into maintJunio C Hamano2012-05-072-0/+20
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rt/cherry-revert-conflict-summary' into maintJunio C Hamano2012-05-071-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-report-mount-point-correctly-in-setup' into maintJunio C Hamano2012-05-071-9/+13
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git p4 doc: fix formattingPete Wyckoff2012-05-071-1/+3
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Makefile: keep many variable list sortedNguyễn Thái Ngọc Duy2012-05-041-13/+13
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-05-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'jc/merge-reduce-parents-early' into maintJunio C Hamano2012-05-035-71/+276
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/cherry-pick-rev-path-confusion' into maintJunio C Hamano2012-05-033-11/+19
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/http-multi-curl-auth' into maintJunio C Hamano2012-05-032-10/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maintJunio C Hamano2012-05-032-4/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rl/maint-stash-i18n-save-error' into maintJunio C Hamano2012-05-031-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/maint-strncpy-diff-no-index' into maintJunio C Hamano2012-05-031-21/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-push-progress'Junio C Hamano2012-05-033-2/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t5541: test more combinations of --progressJeff King2012-05-011-2/+25
| * | | | | | | | | | | | | | | | | | teach send-pack about --[no-]progressJeff King2012-05-012-2/+13
| * | | | | | | | | | | | | | | | | | send-pack: show progress when isatty(2)Jeff King2012-05-011-0/+3
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/columns'Junio C Hamano2012-05-0327-48/+1105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | tag: add --columnNguyễn Thái Ngọc Duy2012-04-275-4/+82
| * | | | | | | | | | | | | | | | | | | column: support piping stdout to external git-column processNguyễn Thái Ngọc Duy2012-04-272-0/+72