Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jn/maint-fix-pager' into maint | Junio C Hamano | 2010-03-04 | 10 | -15/+268 |
|\ | |||||
| * | tests: Fix race condition in t7006-pager | Jonathan Nieder | 2010-02-22 | 1 | -6/+6 |
| * | t7006-pager: if stdout is not a terminal, make a new one | Jonathan Nieder | 2010-02-21 | 2 | -11/+82 |
| * | tests: Add tests for automatic use of pager | Jonathan Nieder | 2010-02-20 | 1 | -0/+163 |
| * | am: Fix launching of pager | Jonathan Nieder | 2010-02-14 | 2 | -4/+14 |
| * | git svn: Fix launching of pager | Jonathan Nieder | 2010-02-14 | 1 | -2/+7 |
| * | git.1: Clarify the behavior of the --paginate option | Jonathan Nieder | 2010-02-14 | 1 | -2/+6 |
| * | Make 'git var GIT_PAGER' always print the configured pager | Jonathan Nieder | 2010-02-14 | 3 | -5/+5 |
| * | Fix 'git var' usage synopsis | Jonathan Nieder | 2010-02-14 | 2 | -2/+2 |
* | | Merge branch 'tr/maint-cherry-pick-list' into maint | Junio C Hamano | 2010-03-04 | 1 | -0/+3 |
|\ \ | |||||
| * | | cherry_pick_list: quit early if one side is empty | Thomas Rast | 2010-02-20 | 1 | -0/+3 |
* | | | Merge branch 'ld/maint-diff-quiet-w' into maint | Junio C Hamano | 2010-03-04 | 2 | -0/+38 |
|\ \ \ | |||||
| * | | | git-diff: add a test for git diff --quiet -w | Larry D'Anna | 2010-02-21 | 1 | -0/+15 |
| * | | | git diff --quiet -w: check and report the status | Larry D'Anna | 2010-02-15 | 1 | -0/+23 |
* | | | | Merge branch 'rs/optim-text-wrap' into maint | Junio C Hamano | 2010-03-04 | 3 | -37/+42 |
|\ \ \ \ | |||||
| * | | | | utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text() | René Scharfe | 2010-02-20 | 1 | -6/+17 |
| * | | | | utf8.c: remove strbuf_write() | René Scharfe | 2010-02-20 | 1 | -13/+5 |
| * | | | | utf8.c: remove print_spaces() | René Scharfe | 2010-02-20 | 1 | -9/+6 |
| * | | | | utf8.c: remove print_wrapped_text() | René Scharfe | 2010-02-20 | 3 | -9/+14 |
* | | | | | Merge branch 'dp/read-not-mmap-small-loose-object' into maint | Junio C Hamano | 2010-03-04 | 1 | -0/+10 |
|\ \ \ \ \ | |||||
| * | | | | | hash-object: don't use mmap() for small files | Dmitry Potapov | 2010-02-21 | 1 | -0/+10 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'np/compress-loose-object-memsave' into maint | Junio C Hamano | 2010-03-04 | 1 | -14/+19 |
|\ \ \ \ \ | |||||
| * | | | | | sha1_file: be paranoid when creating loose objects | Nicolas Pitre | 2010-02-21 | 1 | -0/+9 |
| * | | | | | sha1_file: don't malloc the whole compressed result when writing out objects | Nicolas Pitre | 2010-02-21 | 1 | -14/+10 |
| |/ / / / | |||||
* | | | | | Merge branch 'jc/maint-status-preload' into maint | Junio C Hamano | 2010-03-04 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | status: preload index to optimize lstat(2) calls | Junio C Hamano | 2010-02-17 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'gf/maint-sh-setup-nongit-ok' into maint | Junio C Hamano | 2010-03-04 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | require_work_tree broken with NONGIT_OK | Gabriel Filion | 2010-02-17 | 1 | -1/+1 |
* | | | | | | Merge branch 'cc/maint-bisect-paths' into maint | Junio C Hamano | 2010-03-04 | 2 | -0/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | bisect: error out when passing bad path parameters | Christian Couder | 2010-03-01 | 2 | -0/+11 |
* | | | | | | | Merge branch 'maint-1.6.6' into maint | Junio C Hamano | 2010-03-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'maint-1.6.5' into maint-1.6.6 | Junio C Hamano | 2010-03-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Remove extra '-' from git-am(1) | Michal Sojka | 2010-03-04 | 1 | -1/+1 |
| | |/ / / / / / | |||||
* | | | | | | | | Start preparing for 1.7.0.2 | Junio C Hamano | 2010-03-02 | 2 | -1/+23 |
* | | | | | | | | Merge branch 'tc/maint-transport-ls-remote-with-void' into maint | Junio C Hamano | 2010-03-02 | 2 | -1/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | transport: add got_remote_refs flag | Tay Ray Chuan | 2010-02-16 | 2 | -1/+10 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'hm/maint-imap-send-crlf' into maint | Junio C Hamano | 2010-03-02 | 1 | -1/+39 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-imap-send: Convert LF to CRLF before storing patch to draft box | Hitoshi Mitake | 2010-02-12 | 1 | -1/+39 |
* | | | | | | | | | Merge branch 'sp/maint-push-sideband' into maint | Junio C Hamano | 2010-03-02 | 10 | -134/+370 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | receive-pack: Send internal errors over side-band #2 | Shawn O. Pearce | 2010-02-10 | 2 | -15/+52 |
| * | | | | | | | | | t5401: Use a bare repository for the remote peer | Shawn O. Pearce | 2010-02-09 | 1 | -29/+29 |
| * | | | | | | | | | receive-pack: Send hook output over side band #2 | Shawn O. Pearce | 2010-02-05 | 2 | -17/+70 |
| * | | | | | | | | | receive-pack: Wrap status reports inside side-band-64k | Shawn O. Pearce | 2010-02-05 | 1 | -8/+22 |
| * | | | | | | | | | receive-pack: Refactor how capabilities are shown to the client | Shawn O. Pearce | 2010-02-05 | 1 | -10/+8 |
| * | | | | | | | | | send-pack: demultiplex a sideband stream with status data | Shawn O. Pearce | 2010-02-05 | 1 | -16/+50 |
| * | | | | | | | | | run-command: support custom fd-set in async | Erik Faye-Lund | 2010-02-05 | 7 | -37/+131 |
| * | | | | | | | | | run-command: Allow stderr to be a caller supplied pipe | Shawn O. Pearce | 2010-02-05 | 3 | -2/+10 |
* | | | | | | | | | | Merge branch 'jc/maint-fix-test-perm' into maint | Junio C Hamano | 2010-03-02 | 2 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | lib-patch-mode.sh: Fix permission | Junio C Hamano | 2010-01-30 | 1 | -0/+2 |
| * | | | | | | | | | | Merge commit 'b319ef7' into jc/maint-fix-test-perm | Junio C Hamano | 2010-01-30 | 1466 | -52463/+223107 |
| |\ \ \ \ \ \ \ \ \ \ |