Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jh/maint-submodule-status-in-void' | Junio C Hamano | 2010-03-02 | 2 | -2/+12 |
|\ | |||||
| * | submodule summary: Don't barf when invoked in an empty repo | Johan Herland | 2010-02-17 | 2 | -2/+12 |
* | | Merge branch 'hm/imap-send-cram-md5' | Junio C Hamano | 2010-03-02 | 2 | -15/+135 |
|\ \ | |||||
| * | | imap-send: support CRAM-MD5 authentication | Hitoshi Mitake | 2010-02-17 | 2 | -15/+135 |
* | | | Merge branch 'ml/color-when' | Junio C Hamano | 2010-03-02 | 12 | -11/+66 |
|\ \ \ | |||||
| * | | | Add an optional argument for --color options | Mark Lodato | 2010-02-18 | 12 | -11/+66 |
| | |/ | |/| | |||||
* | | | Merge branch 'ac/cvsimport-revision-mapping' | Junio C Hamano | 2010-03-02 | 3 | -8/+67 |
|\ \ \ | |||||
| * | | | cvsimport: new -R option: generate .git/cvs-revisions mapping | Aaron Crane | 2010-02-06 | 3 | -8/+67 |
* | | | | Merge branch 'jc/grep-author-all-match-implicit' | Junio C Hamano | 2010-03-02 | 6 | -10/+57 |
|\ \ \ \ | |||||
| * | | | | "log --author=me --grep=it" should find intersection, not union | Junio C Hamano | 2010-01-25 | 6 | -10/+57 |
* | | | | | fallback SSH_ASKPASS when GIT_ASKPASS not set | Frank Li | 2010-03-02 | 1 | -0/+3 |
* | | | | | Merge branch 'cc/maint-bisect-paths' | Junio C Hamano | 2010-03-01 | 2 | -0/+11 |
|\ \ \ \ \ | |||||
| * | | | | | bisect: error out when passing bad path parameters | Christian Couder | 2010-03-01 | 2 | -0/+11 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-02-28 | 5 | -24/+31 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Git 1.7.0.1v1.7.0.1 | Junio C Hamano | 2010-02-28 | 3 | -7/+12 |
| * | | | | | | Remove reference to GREP_COLORS from documentation | Mark Lodato | 2010-02-28 | 1 | -3/+1 |
| * | | | | | | sha1_name: fix segfault caused by invalid index access | Markus Heidelberg | 2010-02-28 | 1 | -14/+18 |
* | | | | | | | git svn: delay importing SVN::Base until it is needed | josh robb | 2010-02-26 | 1 | -5/+11 |
* | | | | | | | git-svn: Fix discarding of extra parents from svn:mergeinfo | Tuomas Suutari | 2010-02-26 | 2 | -2/+2 |
* | | | | | | | t9151: Add two new svn:mergeinfo test cases | Tuomas Suutari | 2010-02-26 | 3 | -53/+581 |
* | | | | | | | t9151: Fix a few commits in the SVN dump | Tuomas Suutari | 2010-02-26 | 2 | -38/+74 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-02-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'maint-1.6.6' into maint | Junio C Hamano | 2010-02-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | t3301-notes: insert a shbang line in ./fake_editor.sh | Johannes Sixt | 2010-02-25 | 1 | -0/+1 |
* | | | | | | | | Windows: redirect f[re]open("/dev/null") to f[re]open("nul") | Johannes Sixt | 2010-02-25 | 4 | -0/+33 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-02-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | commit: quote the user name in the example | Matt Kraai | 2010-02-24 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'ml/maint-grep-doc' into maint | Junio C Hamano | 2010-02-24 | 1 | -5/+12 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'maint' | Junio C Hamano | 2010-02-23 | 3 | -6/+9 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am: remove rebase-apply directory before gc | Jonathan Nieder | 2010-02-23 | 1 | -2/+1 |
| * | | | | | | | | rerere: fix memory leak if rerere images can't be read | Bert Wesarg | 2010-02-23 | 1 | -3/+6 |
| * | | | | | | | | Documentation: mention conflict marker size argument (%L) for merge driver | Bert Wesarg | 2010-02-23 | 1 | -1/+2 |
* | | | | | | | | | Merge branch 'ml/maint-grep-doc' | Junio C Hamano | 2010-02-21 | 1 | -5/+12 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | grep documentation: clarify what files match | Mark Lodato | 2010-02-16 | 1 | -5/+12 |
* | | | | | | | | | Merge branch 'tc/maint-transport-ls-remote-with-void' | Junio C Hamano | 2010-02-21 | 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' | Junio C Hamano | 2010-02-21 | 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/push-sideband' | Junio C Hamano | 2010-02-21 | 10 | -134/+370 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'sp/maint-push-sideband' into sp/push-sideband | Junio C Hamano | 2010-02-10 | 2 | -45/+81 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | 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 |
| * | | | | | | | | | | | Merge branch 'sp/maint-push-sideband' into sp/push-sideband | Junio C Hamano | 2010-02-05 | 11 | -90/+290 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | / / | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | 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/checkout-detached' | Junio C Hamano | 2010-02-21 | 5 | -12/+46 |
|\ \ \ \ \ \ \ \ \ \ \ |