Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/maint-add--interactive-delete' | Junio C Hamano | 2010-03-07 | 1 | -0/+8 |
|\ | |||||
| * | add-interactive: fix bogus diff header line ordering | Jeff King | 2010-02-22 | 1 | -0/+8 |
* | | Merge branch 'jc/maint-fix-mailinfo-strip' | Junio C Hamano | 2010-03-07 | 1 | -1/+1 |
|\ \ | |||||
| * | | mailinfo: do not strip leading spaces even for a header line | Junio C Hamano | 2010-02-19 | 1 | -1/+1 |
* | | | Sync with 1.7.0.2 | Junio C Hamano | 2010-03-07 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | unset GREP_OPTIONS in test-lib.sh | Bert Wesarg | 2010-03-07 | 1 | -0/+2 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-07 | 1 | -8/+16 |
|\ \ \ \ | |/ / / | |||||
| * | | | t7406: Fix submodule init config tests | Stephen Boyd | 2010-03-06 | 1 | -8/+16 |
| * | | | Merge branch 'jn/maint-fix-pager' into maint | Junio C Hamano | 2010-03-04 | 2 | -0/+234 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ld/maint-diff-quiet-w' into maint | Junio C Hamano | 2010-03-04 | 1 | -0/+15 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'cc/maint-bisect-paths' into maint | Junio C Hamano | 2010-03-04 | 1 | -0/+5 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'sp/maint-push-sideband' into maint | Junio C Hamano | 2010-03-02 | 1 | -42/+42 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jc/maint-fix-test-perm' into maint | Junio C Hamano | 2010-03-02 | 2 | -0/+4 |
| |\ \ \ \ \ \ \ | |||||
* | | | | | | | | | hash-object: support --stdin-paths with --no-filters | Erik Faye-Lund | 2010-03-05 | 1 | -4/+14 |
* | | | | | | | | | t9119-git-svn-info.sh: test with svn 1.6.* as well | Michael J Gruber | 2010-03-04 | 1 | -1/+2 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-02 | 1 | -5/+13 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | gitweb: Fix project-specific feature override behavior | Jakub Narebski | 2010-03-02 | 1 | -5/+13 |
* | | | | | | | | | Merge branch 'jn/maint-fix-pager' | Junio C Hamano | 2010-03-02 | 2 | -0/+234 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | 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 |
* | | | | | | | | | Merge branch 'ld/maint-diff-quiet-w' | Junio C Hamano | 2010-03-02 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | git-diff: add a test for git diff --quiet -w | Larry D'Anna | 2010-02-21 | 1 | -0/+15 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jh/maint-submodule-status-in-void' | Junio C Hamano | 2010-03-02 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | submodule summary: Don't barf when invoked in an empty repo | Johan Herland | 2010-02-17 | 1 | -0/+7 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ac/cvsimport-revision-mapping' | Junio C Hamano | 2010-03-02 | 1 | -3/+33 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | cvsimport: new -R option: generate .git/cvs-revisions mapping | Aaron Crane | 2010-02-06 | 1 | -3/+33 |
* | | | | | | | | | Merge branch 'jc/grep-author-all-match-implicit' | Junio C Hamano | 2010-03-02 | 1 | -1/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | "log --author=me --grep=it" should find intersection, not union | Junio C Hamano | 2010-01-25 | 1 | -1/+9 |
* | | | | | | | | | | Merge branch 'cc/maint-bisect-paths' | Junio C Hamano | 2010-03-01 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | bisect: error out when passing bad path parameters | Christian Couder | 2010-03-01 | 1 | -0/+5 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | git-svn: Fix discarding of extra parents from svn:mergeinfo | Tuomas Suutari | 2010-02-26 | 1 | -1/+1 |
* | | | | | | | | | 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 | 2 | -0/+11 |
* | | | | | | | | | | Merge branch 'sp/push-sideband' | Junio C Hamano | 2010-02-21 | 1 | -42/+42 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'sp/maint-push-sideband' into sp/push-sideband | Junio C Hamano | 2010-02-10 | 1 | -31/+31 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | receive-pack: Send internal errors over side-band #2 | Shawn O. Pearce | 2010-02-10 | 1 | -1/+2 |
| | * | | | | | | | | | 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 | 1 | -11/+11 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | receive-pack: Send hook output over side band #2 | Shawn O. Pearce | 2010-02-05 | 1 | -11/+11 |
* | | | | | | | | | | Merge branch 'jc/checkout-detached' | Junio C Hamano | 2010-02-21 | 1 | -10/+22 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Reword "detached HEAD" notification | Junio C Hamano | 2010-01-29 | 1 | -10/+22 |
* | | | | | | | | | | | Merge branch 'jc/maint-fix-test-perm' | Junio C Hamano | 2010-02-21 | 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 | 599 | -3731/+44753 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t6000lib: Fix permission | Junio C Hamano | 2010-01-30 | 1 | -0/+2 |