summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Sync with maintJunio C Hamano2009-03-214-22/+35
|\
| * Update draft release notes to 1.6.2.2Junio C Hamano2009-03-212-1/+36
| * ls-files: require worktree when --deleted is givenJeff King2009-03-211-0/+1
| * pickaxe: count regex matches only onceRené Scharfe2009-03-211-2/+4
| * Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-210-0/+0
| |\
| | * Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1Junio C Hamano2009-03-216-152/+115
| | |\
| | * \ Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1Junio C Hamano2009-03-217-27/+73
| | |\ \
| * | \ \ Merge branch 'tr/maint-1.6.0-send-email-irt' into maintJunio C Hamano2009-03-212-1/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'mg/maint-submodule-normalize-path' into maintJunio C Hamano2009-03-212-3/+61
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/memmem' into maintJunio C Hamano2009-03-212-11/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/rsync-local' into maintJunio C Hamano2009-03-212-27/+35
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'db/maint-missing-origin' into maintJunio C Hamano2009-03-213-8/+20
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maintJunio C Hamano2009-03-212-3/+34
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: --numbered-files and --stdout aren't mutually exclusiveStephen Boyd2009-03-212-3/+0
* | | | | | | | | | | http tests: Darwin is not that specialJunio C Hamano2009-03-201-6/+1
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-03-201-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | doc: clarify how -S worksJeff King2009-03-191-1/+4
* | | | | | | | | | | Merge branch 'mv/parseopt-ls-files'Junio C Hamano2009-03-2010-163/+163
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ls-files: fix broken --no-empty-directoryJeff King2009-03-072-3/+15
| * | | | | | | | | | | t3000: use test_cmp instead of diffJeff King2009-03-071-2/+2
| * | | | | | | | | | | parse-opt: migrate builtin-ls-files.Miklos Vajna2009-02-181-135/+120
| * | | | | | | | | | | Turn the flags in struct dir_struct into a single variableJohannes Schindelin2009-02-189-29/+33
* | | | | | | | | | | | Merge branch 'bw/autoconf'Junio C Hamano2009-03-201-118/+268
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | configure: rework pthread handling to allow for user defined flagsBen Walton2009-03-121-15/+74
| * | | | | | | | | | | | configure: make iconv tests aware of user argumentsBen Walton2009-03-121-14/+34
| * | | | | | | | | | | | configure: asciidoc version test cleanupBen Walton2009-03-121-1/+1
| * | | | | | | | | | | | configure: wrap some library tests with GIT_STASH_FLAGSBen Walton2009-03-121-1/+35
| * | | | | | | | | | | | configure: add macros to stash FLAG variablesBen Walton2009-03-121-0/+26
| * | | | | | | | | | | | configure: reorganize flow of argument checksBen Walton2009-03-121-87/+87
| * | | | | | | | | | | | configure: ensure settings from user are also usable in the scriptBen Walton2009-03-121-0/+11
* | | | | | | | | | | | | Merge branch 'xx/db-refspec-vs-js-remote'Junio C Hamano2009-03-205-64/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Adjust js/remote-improvements and db/refspec-wildcard-in-the-middleJunio C Hamano2009-03-0817-330/+812
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Support '*' in the middle of a refspecDaniel Barkalow2009-03-073-11/+36
| * | | | | | | | | | | | | | Keep '*' in pattern refspecsDaniel Barkalow2009-03-072-18/+19
| * | | | | | | | | | | | | | Use the matching function to generate the match resultsDaniel Barkalow2009-03-071-22/+23
| * | | | | | | | | | | | | | Use a single function to match names against patternsDaniel Barkalow2009-03-071-3/+9
| * | | | | | | | | | | | | | Make clone parse the default refspec with the normal codeDaniel Barkalow2009-03-071-12/+13
* | | | | | | | | | | | | | | Merge branch 'jc/clone-branch-rebase'Junio C Hamano2009-03-204-31/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Improve "git branch --tracking" outputJunio C Hamano2009-03-101-6/+17
| * | | | | | | | | | | | | | | Make git-clone respect branch.autosetuprebaseJunio C Hamano2009-03-034-31/+58
* | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-opt'Junio C Hamano2009-03-202-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rebase -i: avoid 'git reset' when possibleJohannes Schindelin2009-03-032-0/+37
* | | | | | | | | | | | | | | | | Merge branch 'fc/parseopt-config'Junio C Hamano2009-03-204-200/+255
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | config: test for --replace-all with one argument and fix documentation.Carlos Rica2009-03-173-3/+10
| * | | | | | | | | | | | | | | | | config: set help text for --bool-or-intJeff King2009-03-071-1/+1
| * | | | | | | | | | | | | | | | | git config: don't allow --get-color* and variable typeFelipe Contreras2009-02-211-0/+5
| * | | | | | | | | | | | | | | | | git config: don't allow extra arguments for -e or -l.Felipe Contreras2009-02-211-0/+2
| * | | | | | | | | | | | | | | | | git config: don't allow multiple variable typesFelipe Contreras2009-02-211-12/+20
| * | | | | | | | | | | | | | | | | git config: don't allow multiple config file locationsFelipe Contreras2009-02-211-0/+5
| * | | | | | | | | | | | | | | | | git config: reorganize to use parseoptFelipe Contreras2009-02-211-154/+195
View Lorry Controller Status