summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | gitweb: Change the way "content tags" ('ctags') are handledJakub Narebski2011-04-291-44/+97
| * | | | | gitweb: Restructure projects list generationJakub Narebski2011-04-293-77/+296
* | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-061-3/+29
* | | | | | Merge branch 'jn/run-command-error-failure'Junio C Hamano2011-05-063-6/+34
|\ \ \ \ \ \
| * | | | | | run-command: handle short writes and EINTR in die_childJonathan Nieder2011-04-201-6/+9
| * | | | | | tests: check error message from run_commandJonathan Nieder2011-04-202-0/+25
* | | | | | | Merge branch 'js/info-man-path'Junio C Hamano2011-05-063-5/+21
|\ \ \ \ \ \ \
| * | | | | | | Documentation: clarify meaning of --html-path, --man-path, and --info-pathJonathan Nieder2011-05-021-6/+6
| * | | | | | | git: add --info-path and --man-path optionsJon Seymour2011-05-013-3/+19
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'im/hashcmp-optim'Junio C Hamano2011-05-061-4/+14
|\ \ \ \ \ \ \
| * | | | | | | hashcmp(): inline memcmp() by hand to optimizeIngo Molnar2011-04-281-4/+14
* | | | | | | | Merge branch 'jk/merge-one-file-working-tree'Junio C Hamano2011-05-062-1/+106
|\ \ \ \ \ \ \ \
| * | | | | | | | merge-one-file: fix broken merges with alternate work treesJeff King2011-04-292-3/+8
| * | | | | | | | add tests for merge-index / merge-one-fileJeff King2011-04-291-0/+100
* | | | | | | | | Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano2011-05-0616-36/+120
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff-files: show unmerged entries correctlyJunio C Hamano2011-04-232-2/+95
| * | | | | | | | | diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-233-11/+6
| * | | | | | | | | diff.c: return filepair from diff_unmerge()Junio C Hamano2011-04-232-6/+9
| * | | | | | | | | test: use $_z40 from test-libJunio C Hamano2011-04-2312-22/+15
* | | | | | | | | | Merge branch 'cj/p4merge'Junio C Hamano2011-05-061-6/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Pass empty file to p4merge where no base is suitable.Ciaran Jessup2011-05-011-6/+3
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gr/cvsimport-alternative-cvspass-location'Junio C Hamano2011-05-061-12/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Look for password in both CVS and CVSNT password files.Guy Rouillier2011-05-011-12/+41
* | | | | | | | | | | Merge branch 'sg/completion-cleanup'Junio C Hamano2011-05-061-161/+60
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | completion: remove unnecessary _get_comp_words_by_ref() invocationsSZEDER Gábor2011-04-281-105/+11
| * | | | | | | | | | | completion: don't modify the $cur variable in completion functionsSZEDER Gábor2011-04-281-57/+50
* | | | | | | | | | | | Merge branch 'js/blame-parsename'Junio C Hamano2011-05-063-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t/annotate-tests: Use echo & cat instead of sedBrian Gernhardt2011-05-051-1/+2
| * | | | | | | | | | | | blame: tolerate bogus e-mail addresses a bit betterJosh Stone2011-04-293-3/+13
| | |_|/ / / / / / / / / | |/| | | | | | | | | |