summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* setup_revisions(): Allow walking history in a submoduleHeiko Voigt2010-07-074-14/+58
* Teach ref iteration module about submodulesHeiko Voigt2010-07-073-32/+127
* Merge branch 'maint'Junio C Hamano2010-07-062-3/+3
|\
| * add missing && to submodule-merge testcaseHeiko Voigt2010-07-061-1/+1
| * test-date: fix sscanf type conversionJeff King2010-07-061-2/+2
* | Merge branch 'maint'Junio C Hamano2010-07-051-1/+3
|\ \ | |/
| * xdiff: optimise for no whitespace difference when ignoring whitespace.Dylan Reid2010-07-051-1/+3
* | gitweb: Move evaluate_gitweb_config out of run_requestJakub Narebski2010-07-051-6/+11
* | parse_date: fix signedness in timezone calculationJeff King2010-07-052-1/+2
* | Merge branch 'maint'Junio C Hamano2010-07-054-6/+22
|\ \ | |/
| * t0006: test timezone parsingJeff King2010-07-052-5/+9
| * rerere.txt: Document forget subcommandMichael J Gruber2010-07-051-1/+6
| * Documentation/git-gc.txt: add reference to githooksChris Packham2010-07-021-0/+7
* | Updates from the list to 1.7.2 Release NotesJunio C Hamano2010-07-021-12/+14
* | Git 1.7.2-rc1v1.7.2-rc1Junio C Hamano2010-06-302-5/+12
* | git.spec.in: Add gitweb subpackageJunio C Hamano2010-06-301-0/+15
* | Merge branch 'ar/decorate-color'Junio C Hamano2010-06-306-8/+176
|\ \
| * | Add test for correct coloring of git log --decorationNazri Ramliy2010-06-301-0/+66
| * | Allow customizable commit decorations colorsNazri Ramliy2010-06-244-0/+45
| * | log --decorate: Colorize commit decorationsNazri Ramliy2010-06-201-1/+33
| * | log-tree.c: Use struct name_decoration's type for classifying decorationNazri Ramliy2010-06-201-8/+32
| * | commit.h: add 'type' to struct name_decorationNazri Ramliy2010-06-201-0/+1
* | | Merge branch 'mg/doc-rev-parse-treepath-syntax'Junio C Hamano2010-06-301-6/+9
|\ \ \
| * | | git-rev-parse.txt: Add more examples for caret and colonMichael J Gruber2010-06-291-7/+8
| * | | git-rev-parse.txt: Document ":path" specifierMichael J Gruber2010-06-271-1/+3
* | | | Merge branch 'cc/cherry-pick-stdin'Junio C Hamano2010-06-304-25/+61
|\ \ \ \
| * | | | revert: do not rebuild argv on heapJonathan Nieder2010-06-292-16/+34
| * | | | Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdinJunio C Hamano2010-06-294-2/+13
| |\ \ \ \
| * | | | | revert: accept arbitrary rev-list optionsChristian Couder2010-06-253-1/+19
| * | | | | t3508 (cherry-pick): futureproof against unmerged filesJonathan Nieder2010-06-141-7/+7
* | | | | | Merge branch 'jl/status-ignore-submodules'Junio C Hamano2010-06-309-16/+177
|\ \ \ \ \ \
| * | | | | | Add the option "--ignore-submodules" to "git status"Jens Lehmann2010-06-258-13/+174
| * | | | | | git submodule: ignore dirty submodules for summary and statusJens Lehmann2010-06-251-3/+3
* | | | | | | Merge branch 'jk/url-decode'Junio C Hamano2010-06-301-4/+4
|\ \ \ \ \ \ \
| * | | | | | | url_decode: URL scheme ends with a colon and does not require a slashJunio C Hamano2010-06-241-4/+4
* | | | | | | | Merge branch 'jn/grep-open'Junio C Hamano2010-06-307-39/+276
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jp/string-list-api-cleanup' into jn/grep-openJulian Phillips2010-06-2730-150/+150
| |\ \ \ \ \ \ \ \
| * | | | | | | | | t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" scriptBrandon Casey2010-06-211-5/+0
| * | | | | | | | | t/t7811-grep-open.sh: ensure fake "less" is made executableBrandon Casey2010-06-211-1/+2
| * | | | | | | | | t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expressionBrandon Casey2010-06-211-1/+1
| * | | | | | | | | grep -O: allow optional argument specifying the pager (or editor)Johannes Schindelin2010-06-133-20/+21
| * | | | | | | | | grep: Add the option '--open-files-in-pager'Johannes Schindelin2010-06-137-13/+255
| * | | | | | | | | Unify code paths of threaded grepsJohannes Schindelin2010-06-131-17/+5
| * | | | | | | | | grep: refactor grep_objects loop into its own functionJonathan Nieder2010-06-131-10/+20
* | | | | | | | | | Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-3029-147/+147
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | string_list: Fix argument order for string_list_appendJulian Phillips2010-06-2716-64/+64
| * | | | | | | | | string_list: Fix argument order for string_list_lookupJulian Phillips2010-06-2711-17/+17
| * | | | | | | | | string_list: Fix argument order for string_list_insert_at_indexJulian Phillips2010-06-273-6/+6
| * | | | | | | | | string_list: Fix argument order for string_list_insertJulian Phillips2010-06-2719-40/+40
| * | | | | | | | | string_list: Fix argument order for for_each_string_listJulian Phillips2010-06-277-18/+18