aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano2012-09-29
|\
| * rebase -i: suggest using --edit-todo to fix an unknown instructionJohannes Sixt2012-09-19
| * rebase -i: Add tests for "--edit-todo"Andrew Wong2012-09-17
| * rebase -i: Teach "--edit-todo" actionAndrew Wong2012-09-17
| * rebase -i: Refactor help messages for todo fileAndrew Wong2012-09-17
| * rebase usage: subcommands can not be combined with -iMartin von Zweigbergk2012-09-17
* | Merge branch 'js/rebase-exec-command-not-found'Junio C Hamano2012-09-29
|\ \
| * | rebase -i: fix misleading error message after 'exec no-such' instructionJohannes Sixt2012-09-18
* | | Merge branch 'rr/test-use-shell-path-not-shell'Junio C Hamano2012-09-29
|\ \ \
| * | | test-lib: use $SHELL_PATH, not $SHELLRamkumar Ramachandra2012-09-25
* | | | Update draft release notes to 1.8.0Junio C Hamano2012-09-25
* | | | Merge branch 'rr/test-make-sure-we-have-git'Junio C Hamano2012-09-25
|\ \ \ \
| * | | | t/test-lib: make sure Git has already been builtRamkumar Ramachandra2012-09-18
| | |/ / | |/| |
* | | | Merge branch 'js/hp-nonstop'Junio C Hamano2012-09-25
|\ \ \ \
| * | | | Port to HP NonStopJoachim Schmitz2012-09-19
* | | | | Merge branch 'js/poll-emu'Junio C Hamano2012-09-25
|\ \ \ \ \ | |/ / / /
| * | | | make poll() work on platforms that can't recv() on a non-socketJoachim Schmitz2012-09-17
| * | | | poll() exits too early with EFAULT if 1st arg is NULLJoachim Schmitz2012-09-17
| * | | | fix some win32 specific dependencies in poll.cJoachim Schmitz2012-09-17
| * | | | make poll available for other platforms lacking itJoachim Schmitz2012-09-17
| | |_|/ | |/| |
* | | | Merge branch 'ep/malloc-check-perturb'Junio C Hamano2012-09-25
|\ \ \ \
| * | | | MALLOC_CHECK: various clean-upsJunio C Hamano2012-09-17
| * | | | Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detectin...Elia Pinto2012-09-14
* | | | | Merge branch 'aj/xfuncname-ada'Junio C Hamano2012-09-25
|\ \ \ \ \
| * | | | | Add userdiff patterns for AdaAdrian Johnson2012-09-16
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jc/maint-mailinfo-mime-attr'Junio C Hamano2012-09-25
|\ \ \ \ \
| * | | | | mailinfo: do not concatenate charset= attribute values from mime headersJunio C Hamano2012-09-17
* | | | | | Merge branch 'po/maint-docs'Junio C Hamano2012-09-25
|\ \ \ \ \ \
| * | | | | | Doc branch: show -vv option and alternativePhilip Oakley2012-09-19
| * | | | | | Doc clean: add See Also linkPhilip Oakley2012-09-18
| * | | | | | Doc add: link gitignorePhilip Oakley2012-09-18
| * | | | | | Doc: separate gitignore pattern sourcesPhilip Oakley2012-09-18
| * | | | | | Doc: shallow clone deepens _to_ new depthPhilip Oakley2012-09-18
* | | | | | | Merge branch 'db/doc-custom-xmlto'Junio C Hamano2012-09-25
|\ \ \ \ \ \ \
| * | | | | | | Documentation/Makefile: Allow custom XMLTO binaryDave Borowitz2012-09-19
| |/ / / / / /
* | | | | | | Merge branch 'maint'Junio C Hamano2012-09-25
|\ \ \ \ \ \ \
| * | | | | | | Revert "completion: fix shell expansion of items"Jeff King2012-09-25
* | | | | | | | Sync with maintJunio C Hamano2012-09-24
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Start preparation for 1.7.12.2Junio C Hamano2012-09-24
| * | | | | | | Merge branch 'jc/maint-blame-no-such-path' into maintJunio C Hamano2012-09-24
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dj/fetch-all-tags' into maintJunio C Hamano2012-09-24
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Improve the description of GIT_PS1_SHOWUPSTREAMJonathan "Duke" Leto2012-09-24
* | | | | | | | | | Merge branch 'mh/fetch-filter-refs'Junio C Hamano2012-09-21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | string_list API: document what "sorted" meansMichael Haggerty2012-09-18
* | | | | | | | | | | Merge branch 'jc/maint-log-grep-all-match-1'Junio C Hamano2012-09-21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | grep.c: make two symbols really file-scope static this timeJunio C Hamano2012-09-20
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-09-20
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'nd/maint-diffstat-summary' into maintJunio C Hamano2012-09-20
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jw/doc-commit-title' into maintJunio C Hamano2012-09-20
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dg/run-command-child-cleanup' into maintJunio C Hamano2012-09-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \