Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Which merge_file() function do you mean? | Junio C Hamano | 2012-12-09 | 7 | -17/+18 |
* | Merge branch 'mm/status-push-pull-advise' | Junio C Hamano | 2012-12-04 | 1 | -2/+3 |
|\ | |||||
| * | document that statusHints affects git checkout | Matthieu Moy | 2012-12-04 | 1 | -2/+3 |
* | | Git 1.8.1-rc0v1.8.1-rc0 | Junio C Hamano | 2012-12-03 | 2 | -12/+14 |
* | | Merge branch 'mm/status-push-pull-advise' | Junio C Hamano | 2012-12-03 | 1 | -6/+9 |
|\ \ | |/ | |||||
| * | status: respect advice.statusHints for ahead/behind advice | Jeff King | 2012-12-03 | 1 | -6/+9 |
* | | Update draft release notes to 1.8.1 | Junio C Hamano | 2012-11-29 | 1 | -1/+32 |
* | | Merge branch 'pw/p4-various-fixes' | Junio C Hamano | 2012-11-29 | 3 | -20/+137 |
|\ \ | |||||
| * | | git p4: remove unneeded cmd initialization | Pete Wyckoff | 2012-11-26 | 1 | -1/+0 |
| * | | git p4: fix labelDetails typo in exception | Pete Wyckoff | 2012-11-26 | 1 | -1/+1 |
| * | | git p4 test: display unresolvable host error | Pete Wyckoff | 2012-11-26 | 1 | -0/+12 |
| * | | git p4: catch p4 errors when streaming file contents | Pete Wyckoff | 2012-11-26 | 2 | -8/+43 |
| * | | git p4: handle servers without move support | Pete Wyckoff | 2012-11-26 | 2 | -1/+55 |
| * | | git p4: catch p4 describe errors | Pete Wyckoff | 2012-11-26 | 1 | -9/+26 |
* | | | Merge branch 'lt/diff-stat-show-0-lines' | Junio C Hamano | 2012-11-29 | 2 | -28/+74 |
|\ \ \ | |||||
| * | | | t4049: refocus tests | Junio C Hamano | 2012-11-29 | 1 | -11/+9 |
| * | | | diff --shortstat: do not count "unmerged" entries | Junio C Hamano | 2012-11-27 | 1 | -3/+2 |
| * | | | diff --stat: do not count "unmerged" entries | Junio C Hamano | 2012-11-27 | 2 | -3/+5 |
| * | | | diff --stat: move the "total count" logic to the last loop | Junio C Hamano | 2012-11-27 | 2 | -10/+13 |
| * | | | diff --stat: use "file" temporary variable to refer to data->files[i] | Junio C Hamano | 2012-11-27 | 1 | -13/+13 |
| * | | | diff --stat: status of unmodified pair in diff-q is not zero | Junio C Hamano | 2012-11-27 | 1 | -1/+1 |
| * | | | test: add failing tests for "diff --stat" to t4049 | Junio C Hamano | 2012-11-27 | 1 | -1/+45 |
* | | | | Merge branch 'fc/remote-hg' | Junio C Hamano | 2012-11-29 | 6 | -1/+1639 |
|\ \ \ \ | |||||
| * | | | | remote-hg: fix for older versions of python | Felipe Contreras | 2012-11-27 | 1 | -4/+8 |
| * | | | | remote-hg: fix for files with spaces | Felipe Contreras | 2012-11-27 | 1 | -1/+1 |
| * | | | | remote-hg: avoid bad refs | Felipe Contreras | 2012-11-12 | 1 | -0/+3 |
| * | | | | remote-hg: try the 'tip' if no checkout present | Felipe Contreras | 2012-11-12 | 1 | -0/+2 |
| * | | | | remote-hg: fix compatibility with older versions of hg | Felipe Contreras | 2012-11-12 | 1 | -1/+1 |
| * | | | | remote-hg: add missing config for basic tests | Ramkumar Ramachandra | 2012-11-12 | 1 | -0/+9 |
| * | | | | remote-hg: the author email can be null | Felipe Contreras | 2012-11-04 | 1 | -3/+3 |
| * | | | | remote-hg: add option to not track branches | Felipe Contreras | 2012-11-04 | 1 | -8/+14 |
| * | | | | remote-hg: add extra author test | Felipe Contreras | 2012-11-04 | 1 | -1/+5 |
| * | | | | remote-hg: add tests to compare with hg-git | Felipe Contreras | 2012-11-04 | 1 | -0/+462 |
| * | | | | remote-hg: add bidirectional tests | Felipe Contreras | 2012-11-04 | 1 | -0/+243 |
| * | | | | test-lib: avoid full path to store test results | Felipe Contreras | 2012-11-04 | 1 | -1/+2 |
| * | | | | remote-hg: add basic tests | Felipe Contreras | 2012-11-04 | 2 | -0/+125 |
| * | | | | remote-hg: fake bookmark when there's none | Felipe Contreras | 2012-11-04 | 1 | -5/+14 |
| * | | | | remote-hg: add compat for hg-git author fixes | Felipe Contreras | 2012-11-04 | 1 | -6/+53 |
| * | | | | remote-hg: add support for hg-git compat mode | Felipe Contreras | 2012-11-04 | 1 | -6/+83 |
| * | | | | remote-hg: match hg merge behavior | Felipe Contreras | 2012-11-04 | 1 | -0/+17 |
| * | | | | remote-hg: make sure the encoding is correct | Felipe Contreras | 2012-11-04 | 1 | -1/+11 |
| * | | | | remote-hg: add support to push URLs | Felipe Contreras | 2012-11-04 | 1 | -2/+12 |
| * | | | | remote-hg: add support for remote pushing | Felipe Contreras | 2012-11-04 | 1 | -2/+7 |
| * | | | | remote-hg: add support for pushing | Felipe Contreras | 2012-11-04 | 1 | -2/+215 |
| * | | | | Add new remote-hg transport helper | Felipe Contreras | 2012-11-04 | 1 | -0/+391 |
* | | | | | Merge branch 'mk/complete-tcsh' | Junio C Hamano | 2012-11-29 | 1 | -7/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Support for git aliasing for tcsh completion | Marc Khouzam | 2012-11-27 | 1 | -7/+12 |
* | | | | | | Merge branch 'jc/doc-push-satellite' | Junio C Hamano | 2012-11-29 | 1 | -2/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation/git-push.txt: clarify the "push from satellite" workflow | Junio C Hamano | 2012-11-27 | 1 | -2/+14 |
* | | | | | | | Merge branch 'km/send-email-remove-cruft-in-address' | Junio C Hamano | 2012-11-29 | 1 | -18/+59 |
|\ \ \ \ \ \ \ |