summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Add several testcases for --dirstat and friendsJohan Herland2011-04-291-0/+585
* | | | | | | | | | | | | | Merge branch 'jc/fix-add-u-unmerged'Junio C Hamano2011-05-132-39/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2011-04-232-39/+30
* | | | | | | | | | | | | | | Merge branch 'jn/setup-revisions-glob-and-friends-passthru'Junio C Hamano2011-05-132-65/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | revisions: allow --glob and friends in parse_options-enabled commandsJonathan Nieder2011-04-212-1/+63
| * | | | | | | | | | | | | | | revisions: split out handle_revision_pseudo_opt functionJonathan Nieder2011-04-211-64/+59
* | | | | | | | | | | | | | | | Merge branch 'cn/log-parse-opt'Junio C Hamano2011-05-131-30/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | log: convert to parse-optionsCarlos Martín Nieto2011-04-141-30/+43
* | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-132-2/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Prepare for 1.7.5.2Junio C Hamano2011-05-132-1/+34
| * | | | | | | | | | | | | | | | Merge branch 'aw/maint-rebase-i-p-no-ff' into maintJunio C Hamano2011-05-132-2/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-133-3/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gr/cvsimport-alternative-cvspass-location' into maintJunio C Hamano2011-05-131-12/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cj/p4merge' into maintJunio C Hamano2011-05-131-6/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/merge-one-file-working-tree' into maintJunio C Hamano2011-05-132-1/+106
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-1316-36/+120
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'mz/maint-rename-unmerged' into maintJunio C Hamano2011-05-132-2/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | t5400: Fix a couple of typosJohan Herland2011-05-131-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-121-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Tweak t3102-ls-tree-wildcards to run on WindowsJohannes Sixt2011-05-121-7/+7
* | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-111-3/+18
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-dependency'Junio C Hamano2011-05-111-27/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Remove gitweb/gitweb.cgi and other legacy targets from main MakefileJakub Narebski2011-05-081-26/+0
| * | | | | | | | | | | | | | | | | | | | | | | git-instaweb: Simplify build dependency on gitwebJakub Narebski2011-05-081-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano2011-05-112-15/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | merge: make branch.<name>.mergeoptions correctly override merge.<option>Junio C Hamano2011-05-062-14/+57
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/maint-test-merge-verify-parents'Junio C Hamano2011-05-112-99/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | tests: teach verify_parents to check for extra parentsJonathan Nieder2011-05-061-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | tests: eliminate unnecessary setup test assertionsJonathan Nieder2011-05-062-99/+97
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'vh/config-interactive-singlekey-doc'Junio C Hamano2011-05-115-13/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | git-reset.txt: better docs for '--patch'Valentin Haenel2011-05-051-3/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | git-checkout.txt: better docs for '--patch'Valentin Haenel2011-05-051-3/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | git-stash.txt: better docs for '--patch'Valentin Haenel2011-05-051-4/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | git-add.txt: document 'interactive.singlekey'Valentin Haenel2011-05-051-1/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | config.txt: 'interactive.singlekey; is used by...Valentin Haenel2011-05-051-2/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks'Junio C Hamano2011-05-113-16/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | t3701: add-p-fix makes the last test to passJunio C Hamano2011-05-081-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | "add -p": work-around an old laziness that does not coalesce hunksJunio C Hamano2011-04-292-4/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | add--interactive.perl: factor out repeated --recount optionJunio C Hamano2011-04-291-8/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | t3701: Editing a split hunk in an "add -p" sessionJunio C Hamano2011-04-291-0/+36
| * | | | | | | | | | | | | | | | | | | | | | | | | add -p: 'q' should really quitJunio C Hamano2011-04-291-5/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sr/maint-fast-import-tighten-option-parsing'Junio C Hamano2011-05-111-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | fast-import: fix option parser for no-arg optionsSverre Rabbelier2011-05-051-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dm/http-cleanup'Junio C Hamano2011-05-116-114/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t5541-http-push: add test for chunkedTay Ray Chuan2011-05-041-2/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | http-push: refactor curl_easy_setup madnessDan McGee2011-05-041-96/+48
| * | | | | | | | | | | | | | | | | | | | | | | | | | | http-push: use const for strings in signaturesDan McGee2011-05-041-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | http: make curl callbacks match contracts from curl headerDan McGee2011-05-044-12/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/ctags'Junio C Hamano2011-05-113-121/+399
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)Jakub Narebski2011-04-291-3/+9