aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'cc/cherry-pick-stdin'Junio C Hamano2010-06-30
|\
| * revert: do not rebuild argv on heapJonathan Nieder2010-06-29
| * Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdinJunio C Hamano2010-06-29
| |\
| * | revert: accept arbitrary rev-list optionsChristian Couder2010-06-25
| * | t3508 (cherry-pick): futureproof against unmerged filesJonathan Nieder2010-06-14
* | | Merge branch 'jl/status-ignore-submodules'Junio C Hamano2010-06-30
|\ \ \
| * | | Add the option "--ignore-submodules" to "git status"Jens Lehmann2010-06-25
| * | | git submodule: ignore dirty submodules for summary and statusJens Lehmann2010-06-25
* | | | Merge branch 'jk/url-decode'Junio C Hamano2010-06-30
|\ \ \ \
| * | | | url_decode: URL scheme ends with a colon and does not require a slashJunio C Hamano2010-06-24
* | | | | Merge branch 'jn/grep-open'Junio C Hamano2010-06-30
|\ \ \ \ \
| * \ \ \ \ Merge branch 'jp/string-list-api-cleanup' into jn/grep-openJulian Phillips2010-06-27
| |\ \ \ \ \
| * | | | | | t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" scriptBrandon Casey2010-06-21
| * | | | | | t/t7811-grep-open.sh: ensure fake "less" is made executableBrandon Casey2010-06-21
| * | | | | | t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expressionBrandon Casey2010-06-21
| * | | | | | grep -O: allow optional argument specifying the pager (or editor)Johannes Schindelin2010-06-13
| * | | | | | grep: Add the option '--open-files-in-pager'Johannes Schindelin2010-06-13
| * | | | | | Unify code paths of threaded grepsJohannes Schindelin2010-06-13
| * | | | | | grep: refactor grep_objects loop into its own functionJonathan Nieder2010-06-13
* | | | | | | Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-30
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | string_list: Fix argument order for string_list_appendJulian Phillips2010-06-27
| * | | | | | string_list: Fix argument order for string_list_lookupJulian Phillips2010-06-27
| * | | | | | string_list: Fix argument order for string_list_insert_at_indexJulian Phillips2010-06-27
| * | | | | | string_list: Fix argument order for string_list_insertJulian Phillips2010-06-27
| * | | | | | string_list: Fix argument order for for_each_string_listJulian Phillips2010-06-27
| * | | | | | string_list: Fix argument order for print_string_listJulian Phillips2010-06-27
| |/ / / / /
* | | | | | Merge branch 'tr/rev-list-count'Junio C Hamano2010-06-30
|\ \ \ \ \ \
| * | | | | | bash completion: Support "divergence from upstream" messages in __git_ps1Andrew Sayers2010-06-24
| * | | | | | rev-list: introduce --count optionThomas Rast2010-06-12
* | | | | | | Merge branch 'as/maint-completion-set-u-fix'Junio C Hamano2010-06-30
|\ \ \ \ \ \ \
| * | | | | | | bash-completion: Fix __git_ps1 to work with "set -u"Andrew Sayers2010-06-18
* | | | | | | | Merge branch 'mg/rev-parse-tests'Junio C Hamano2010-06-30
|\ \ \ \ \ \ \ \
| * | | | | | | | t6018: make sure all tested symbolic names are different revsMichael J Gruber2010-06-27
| * | | | | | | | t6018: add tests for rev-list's --branches and --tagsMichael J Gruber2010-06-27
* | | | | | | | | Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano2010-06-30
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | t4027,4041: Use test -s to test for an empty fileBrian Gernhardt2010-06-25
| * | | | | | | | Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann2010-06-11
| * | | | | | | | git diff: rename test that had a conflicting nameJens Lehmann2010-06-11
* | | | | | | | | Sync with 1.7.1.1Junio C Hamano2010-06-29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Git 1.7.1.1v1.7.1.1Junio C Hamano2010-06-29
| * | | | | | | | | t/t9001: use egrep when regular expressions are involvedBrandon Casey2010-06-29
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-06-28
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Update draft release notes to 1.7.1.1Junio C Hamano2010-06-28
| * | | | | | | | | Merge branch 'tr/send-email-8bit' into maintJunio C Hamano2010-06-28
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'pb/maint-perl-errmsg-no-dir' into maintJunio C Hamano2010-06-28
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-am-rebase-invalid-author' into maintJunio C Hamano2010-06-28
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-simpler-common-prefix' into maintJunio C Hamano2010-06-28
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maintJunio C Hamano2010-06-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | notes: Initialise variable to appease gccRamsay Jones2010-06-28
| * | | | | | | | | | | | | | notes: check number of parameters to "git notes copy"Jeff King2010-06-28