aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* apply: accept -3/--3way command line optionJunio C Hamano2012-07-09
* apply: move "already exists" logic to check_to_create()Junio C Hamano2012-07-09
* apply: move check_to_create_blob() closer to its sole callerJunio C Hamano2012-07-09
* apply: further split load_preimage()Junio C Hamano2012-07-09
* apply: refactor "previous patch" logicJunio C Hamano2012-07-09
* apply: split load_preimage() helper function outJunio C Hamano2012-07-09
* apply: factor out checkout_target() helper functionJunio C Hamano2012-07-09
* apply: refactor read_file_or_gitlink()Junio C Hamano2012-07-09
* apply: clear_image() clears things a bit moreJunio C Hamano2012-07-09
* apply: a bit more comments on PATH_TO_BE_DELETEDJunio C Hamano2012-07-09
* apply: fix an incomplete comment in check_patch()Junio C Hamano2012-07-09
* The ninth batch of topics graduated to 'master'Junio C Hamano2012-05-07
* Merge branch 'nh/empty-rebase'Junio C Hamano2012-05-07
|\
| * git cherry-pick: do not dereference a potential NULL pointerNeil Horman2012-05-03
* | Merge branch 'zj/diff-empty-chmod'Junio C Hamano2012-05-07
|\ \
| * | t4006: Windows do not have /dev/zeroJohannes Sixt2012-05-02
| * | diff --stat: do not run diff on indentical filesZbigniew Jędrzejewski-Szmek2012-05-01
| * | diff --stat: report mode-only changes for binary files like text filesZbigniew Jędrzejewski-Szmek2012-05-01
| * | tests: check --[short]stat output after chmodZbigniew Jędrzejewski-Szmek2012-05-01
| * | test: modernize style of t4006Zbigniew Jędrzejewski-Szmek2012-05-01
* | | Merge branch 'jk/maint-tformat-with-z'Junio C Hamano2012-05-07
|\ \ \
| * | | log-tree: the previous one is still not quite rightJunio C Hamano2012-05-01
| * | | log-tree: use custom line terminator in line termination modeJan Krüger2012-05-01
* | | | Merge branch 'th/difftool-diffall'Junio C Hamano2012-05-07
|\ \ \ \
| * | | | difftool: print list of valid tools with '--tool-help'Tim Henigan2012-04-23
| * | | | difftool: teach difftool to handle directory diffsTim Henigan2012-04-23
| * | | | difftool: eliminate setup_environment functionTim Henigan2012-03-23
| * | | | difftool: stop appending '.exe' to gitTim Henigan2012-03-23
| * | | | difftool: remove explicit change of PATHTim Henigan2012-03-23
| * | | | difftool: exit(0) when usage is printedTim Henigan2012-03-23
| * | | | difftool: add '--no-gui' optionTim Henigan2012-03-23
| * | | | difftool: parse options using Getopt::LongTim Henigan2012-03-23
* | | | | Sync with maintJunio C Hamano2012-05-07
|\ \ \ \ \
| * | | | | Start preparing for 1.7.10.2Junio C Hamano2012-05-07
| * | | | | Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maintJunio C Hamano2012-05-07
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/daemon-test-race-fix' into maintJunio C Hamano2012-05-07
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/maint-config-bogus-section' into maintJunio C Hamano2012-05-07
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pw/t5800-import-race-fix' into maintJunio C Hamano2012-05-07
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rt/cherry-revert-conflict-summary' into maintJunio C Hamano2012-05-07
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-report-mount-point-correctly-in-setup' into maintJunio C Hamano2012-05-07
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git p4 doc: fix formattingPete Wyckoff2012-05-07
* | | | | | | | | | | | Makefile: keep many variable list sortedNguyễn Thái Ngọc Duy2012-05-04
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-05-03
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'jc/merge-reduce-parents-early' into maintJunio C Hamano2012-05-03
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/cherry-pick-rev-path-confusion' into maintJunio C Hamano2012-05-03
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/http-multi-curl-auth' into maintJunio C Hamano2012-05-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maintJunio C Hamano2012-05-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rl/maint-stash-i18n-save-error' into maintJunio C Hamano2012-05-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/maint-strncpy-diff-no-index' into maintJunio C Hamano2012-05-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-push-progress'Junio C Hamano2012-05-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \