Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'vh/config-interactive-singlekey-doc' | Junio C Hamano | 2011-05-11 | 5 | -13/+21 |
|\ | |||||
| * | git-reset.txt: better docs for '--patch' | Valentin Haenel | 2011-05-05 | 1 | -3/+4 |
| * | git-checkout.txt: better docs for '--patch' | Valentin Haenel | 2011-05-05 | 1 | -3/+4 |
| * | git-stash.txt: better docs for '--patch' | Valentin Haenel | 2011-05-05 | 1 | -4/+5 |
| * | git-add.txt: document 'interactive.singlekey' | Valentin Haenel | 2011-05-05 | 1 | -1/+5 |
| * | config.txt: 'interactive.singlekey; is used by... | Valentin Haenel | 2011-05-05 | 1 | -2/+3 |
* | | Merge branch 'jc/maint-add-p-overlapping-hunks' | Junio C Hamano | 2011-05-11 | 3 | -16/+54 |
|\ \ | |||||
| * | | t3701: add-p-fix makes the last test to pass | Junio C Hamano | 2011-05-08 | 1 | -1/+1 |
| * | | "add -p": work-around an old laziness that does not coalesce hunks | Junio C Hamano | 2011-04-29 | 2 | -4/+7 |
| * | | add--interactive.perl: factor out repeated --recount option | Junio C Hamano | 2011-04-29 | 1 | -8/+8 |
| * | | t3701: Editing a split hunk in an "add -p" session | Junio C Hamano | 2011-04-29 | 1 | -0/+36 |
| * | | add -p: 'q' should really quit | Junio C Hamano | 2011-04-29 | 1 | -5/+4 |
* | | | Merge branch 'sr/maint-fast-import-tighten-option-parsing' | Junio C Hamano | 2011-05-11 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | fast-import: fix option parser for no-arg options | Sverre Rabbelier | 2011-05-05 | 1 | -3/+3 |
* | | | | Merge branch 'dm/http-cleanup' | Junio C Hamano | 2011-05-11 | 6 | -114/+80 |
|\ \ \ \ | |||||
| * | | | | t5541-http-push: add test for chunked | Tay Ray Chuan | 2011-05-04 | 1 | -2/+16 |
| * | | | | http-push: refactor curl_easy_setup madness | Dan McGee | 2011-05-04 | 1 | -96/+48 |
| * | | | | http-push: use const for strings in signatures | Dan McGee | 2011-05-04 | 1 | -4/+4 |
| * | | | | http: make curl callbacks match contracts from curl header | Dan McGee | 2011-05-04 | 4 | -12/+12 |
* | | | | | Merge branch 'jn/ctags' | Junio C Hamano | 2011-05-11 | 3 | -121/+399 |
|\ \ \ \ \ | |||||
| * | | | | | gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo) | Jakub Narebski | 2011-04-29 | 1 | -3/+9 |
| * | | | | | gitweb: Change the way "content tags" ('ctags') are handled | Jakub Narebski | 2011-04-29 | 1 | -44/+97 |
| * | | | | | gitweb: Restructure projects list generation | Jakub Narebski | 2011-04-29 | 3 | -77/+296 |
* | | | | | | Update draft release notes to 1.7.6 | Junio C Hamano | 2011-05-06 | 1 | -3/+29 |
* | | | | | | Merge branch 'jn/run-command-error-failure' | Junio C Hamano | 2011-05-06 | 3 | -6/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | run-command: handle short writes and EINTR in die_child | Jonathan Nieder | 2011-04-20 | 1 | -6/+9 |
| * | | | | | | tests: check error message from run_command | Jonathan Nieder | 2011-04-20 | 2 | -0/+25 |
* | | | | | | | Merge branch 'js/info-man-path' | Junio C Hamano | 2011-05-06 | 3 | -5/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation: clarify meaning of --html-path, --man-path, and --info-path | Jonathan Nieder | 2011-05-02 | 1 | -6/+6 |
| * | | | | | | | git: add --info-path and --man-path options | Jon Seymour | 2011-05-01 | 3 | -3/+19 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'im/hashcmp-optim' | Junio C Hamano | 2011-05-06 | 1 | -4/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | hashcmp(): inline memcmp() by hand to optimize | Ingo Molnar | 2011-04-28 | 1 | -4/+14 |
* | | | | | | | | Merge branch 'jk/merge-one-file-working-tree' | Junio C Hamano | 2011-05-06 | 2 | -1/+106 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge-one-file: fix broken merges with alternate work trees | Jeff King | 2011-04-29 | 2 | -3/+8 |
| * | | | | | | | | add tests for merge-index / merge-one-file | Jeff King | 2011-04-29 | 1 | -0/+100 |
* | | | | | | | | | Merge branch 'jc/fix-diff-files-unmerged' | Junio C Hamano | 2011-05-06 | 16 | -36/+120 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | diff-files: show unmerged entries correctly | Junio C Hamano | 2011-04-23 | 2 | -2/+95 |
| * | | | | | | | | | diff: remove often unused parameters from diff_unmerge() | Junio C Hamano | 2011-04-23 | 3 | -11/+6 |
| * | | | | | | | | | diff.c: return filepair from diff_unmerge() | Junio C Hamano | 2011-04-23 | 2 | -6/+9 |
| * | | | | | | | | | test: use $_z40 from test-lib | Junio C Hamano | 2011-04-23 | 12 | -22/+15 |
* | | | | | | | | | | Merge branch 'cj/p4merge' | Junio C Hamano | 2011-05-06 | 1 | -6/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Pass empty file to p4merge where no base is suitable. | Ciaran Jessup | 2011-05-01 | 1 | -6/+3 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'gr/cvsimport-alternative-cvspass-location' | Junio C Hamano | 2011-05-06 | 1 | -12/+41 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Look for password in both CVS and CVSNT password files. | Guy Rouillier | 2011-05-01 | 1 | -12/+41 |
* | | | | | | | | | | | Merge branch 'sg/completion-cleanup' | Junio C Hamano | 2011-05-06 | 1 | -161/+60 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | completion: remove unnecessary _get_comp_words_by_ref() invocations | SZEDER Gábor | 2011-04-28 | 1 | -105/+11 |
| * | | | | | | | | | | | completion: don't modify the $cur variable in completion functions | SZEDER Gábor | 2011-04-28 | 1 | -57/+50 |
* | | | | | | | | | | | | Merge branch 'js/blame-parsename' | Junio C Hamano | 2011-05-06 | 3 | -3/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t/annotate-tests: Use echo & cat instead of sed | Brian Gernhardt | 2011-05-05 | 1 | -1/+2 |
| * | | | | | | | | | | | | blame: tolerate bogus e-mail addresses a bit better | Josh Stone | 2011-04-29 | 3 | -3/+13 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | |