Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/maint-status-porcelain-z-b' into HEAD | Jeff King | 2012-05-08 | 5 | -89/+105 |
|\ | |||||
| * | status: respect "-b" for porcelain format | Jeff King | 2012-05-08 | 5 | -11/+16 |
| * | status: fix null termination with "-b" | Jeff King | 2012-05-08 | 2 | -3/+13 |
| * | status: refactor null_termination option | Jeff King | 2012-05-08 | 3 | -24/+24 |
| * | commit: refactor option parsing | Jeff King | 2012-05-08 | 1 | -58/+59 |
* | | The ninth batch of topics graduated to 'master' | Junio C Hamano | 2012-05-07 | 1 | -50/+19 |
* | | Merge branch 'nh/empty-rebase' | Junio C Hamano | 2012-05-07 | 1 | -3/+11 |
|\ \ | |||||
| * | | git cherry-pick: do not dereference a potential NULL pointer | Neil Horman | 2012-05-03 | 1 | -3/+11 |
* | | | Merge branch 'zj/diff-empty-chmod' | Junio C Hamano | 2012-05-07 | 2 | -34/+74 |
|\ \ \ | |||||
| * | | | t4006: Windows do not have /dev/zero | Johannes Sixt | 2012-05-02 | 1 | -1/+1 |
| * | | | diff --stat: do not run diff on indentical files | Zbigniew Jędrzejewski-Szmek | 2012-05-01 | 1 | -2/+5 |
| * | | | diff --stat: report mode-only changes for binary files like text files | Zbigniew Jędrzejewski-Szmek | 2012-05-01 | 2 | -22/+24 |
| * | | | tests: check --[short]stat output after chmod | Zbigniew Jędrzejewski-Szmek | 2012-05-01 | 1 | -0/+37 |
| * | | | test: modernize style of t4006 | Zbigniew Jędrzejewski-Szmek | 2012-05-01 | 1 | -16/+14 |
* | | | | Merge branch 'jk/maint-tformat-with-z' | Junio C Hamano | 2012-05-07 | 2 | -1/+29 |
|\ \ \ \ | |||||
| * | | | | log-tree: the previous one is still not quite right | Junio C Hamano | 2012-05-01 | 1 | -0/+16 |
| * | | | | log-tree: use custom line terminator in line termination mode | Jan Krüger | 2012-05-01 | 2 | -1/+13 |
* | | | | | Merge branch 'th/difftool-diffall' | Junio C Hamano | 2012-05-07 | 4 | -87/+398 |
|\ \ \ \ \ | |||||
| * | | | | | difftool: print list of valid tools with '--tool-help' | Tim Henigan | 2012-04-23 | 3 | -7/+64 |
| * | | | | | difftool: teach difftool to handle directory diffs | Tim Henigan | 2012-04-23 | 4 | -27/+303 |
| * | | | | | difftool: eliminate setup_environment function | Tim Henigan | 2012-03-23 | 1 | -7/+2 |
| * | | | | | difftool: stop appending '.exe' to git | Tim Henigan | 2012-03-23 | 1 | -10/+1 |
| * | | | | | difftool: remove explicit change of PATH | Tim Henigan | 2012-03-23 | 1 | -4/+0 |
| * | | | | | difftool: exit(0) when usage is printed | Tim Henigan | 2012-03-23 | 1 | -4/+5 |
| * | | | | | difftool: add '--no-gui' option | Tim Henigan | 2012-03-23 | 2 | -3/+17 |
| * | | | | | difftool: parse options using Getopt::Long | Tim Henigan | 2012-03-23 | 1 | -65/+46 |
* | | | | | | Sync with maint | Junio C Hamano | 2012-05-07 | 2 | -2/+49 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Start preparing for 1.7.10.2 | Junio C Hamano | 2012-05-07 | 2 | -1/+47 |
| * | | | | | | Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maint | Junio C Hamano | 2012-05-07 | 3 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'js/daemon-test-race-fix' into maint | Junio C Hamano | 2012-05-07 | 1 | -11/+11 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/maint-config-bogus-section' into maint | Junio C Hamano | 2012-05-07 | 2 | -1/+31 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'pw/t5800-import-race-fix' into maint | Junio C Hamano | 2012-05-07 | 2 | -0/+20 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rt/cherry-revert-conflict-summary' into maint | Junio C Hamano | 2012-05-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-report-mount-point-correctly-in-setup' into maint | Junio C Hamano | 2012-05-07 | 1 | -9/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git p4 doc: fix formatting | Pete Wyckoff | 2012-05-07 | 1 | -1/+3 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Makefile: keep many variable list sorted | Nguyễn Thái Ngọc Duy | 2012-05-04 | 1 | -13/+13 |
* | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-05-03 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge branch 'jc/merge-reduce-parents-early' into maint | Junio C Hamano | 2012-05-03 | 5 | -71/+276 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/cherry-pick-rev-path-confusion' into maint | Junio C Hamano | 2012-05-03 | 3 | -11/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/http-multi-curl-auth' into maint | Junio C Hamano | 2012-05-03 | 2 | -10/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maint | Junio C Hamano | 2012-05-03 | 2 | -4/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rl/maint-stash-i18n-save-error' into maint | Junio C Hamano | 2012-05-03 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jm/maint-strncpy-diff-no-index' into maint | Junio C Hamano | 2012-05-03 | 1 | -21/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-push-progress' | Junio C Hamano | 2012-05-03 | 3 | -2/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | t5541: test more combinations of --progress | Jeff King | 2012-05-01 | 1 | -2/+25 |
| * | | | | | | | | | | | | | | | | | | teach send-pack about --[no-]progress | Jeff King | 2012-05-01 | 2 | -2/+13 |
| * | | | | | | | | | | | | | | | | | | send-pack: show progress when isatty(2) | Jeff King | 2012-05-01 | 1 | -0/+3 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/columns' | Junio C Hamano | 2012-05-03 | 27 | -48/+1105 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | tag: add --column | Nguyễn Thái Ngọc Duy | 2012-04-27 | 5 | -4/+82 |
| * | | | | | | | | | | | | | | | | | | | column: support piping stdout to external git-column process | Nguyễn Thái Ngọc Duy | 2012-04-27 | 2 | -0/+72 |