Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove superfluous newlines in error messages | Pete Wyckoff | 2012-04-30 | 15 | -24/+24 |
* | Merge branch 'ld/git-p4-tags-and-labels' | Junio C Hamano | 2012-04-30 | 6 | -69/+483 |
|\ | |||||
| * | git p4: fix unit tests | Luke Diamand | 2012-04-25 | 1 | -1/+1 |
| * | git p4: move verbose to base class | Luke Diamand | 2012-04-24 | 2 | -28/+14 |
| * | git p4: Ignore P4EDITOR if it is empty | Luke Diamand | 2012-04-24 | 1 | -1/+1 |
| * | git p4: Squash P4EDITOR in test harness | Luke Diamand | 2012-04-24 | 1 | -0/+1 |
| * | git p4: fix-up "import/export of labels to/from p4" | Luke Diamand | 2012-04-24 | 3 | -25/+23 |
| * | git p4: import/export of labels to/from p4 | Luke Diamand | 2012-04-11 | 3 | -39/+468 |
| * | git p4: Fixing script editor checks | Luke Diamand | 2012-04-11 | 1 | -2/+2 |
* | | Merge branch 'nh/empty-rebase' | Junio C Hamano | 2012-04-30 | 9 | -19/+193 |
|\ \ | |||||
| * | | git-rebase: add keep_empty flag | Neil Horman | 2012-04-24 | 4 | -8/+55 |
| * | | git-cherry-pick: Add test to validate new options | Neil Horman | 2012-04-24 | 1 | -1/+24 |
| * | | git-cherry-pick: Add keep-redundant-commits option | Neil Horman | 2012-04-24 | 4 | -13/+102 |
| * | | git-cherry-pick: add allow-empty option | Neil Horman | 2012-04-11 | 4 | -2/+17 |
* | | | Merge branch 'jk/maint-config-bogus-section' | Junio C Hamano | 2012-04-30 | 2 | -1/+31 |
|\ \ \ | |||||
| * | | | config: reject bogus section names for --rename-section | Jeff King | 2012-04-25 | 2 | -1/+31 |
* | | | | The seventh batch of topics graduated to 'master' | Junio C Hamano | 2012-04-29 | 1 | -0/+16 |
* | | | | Merge branch 'js/daemon-test-race-fix' | Junio C Hamano | 2012-04-29 | 1 | -11/+11 |
|\ \ \ \ | |||||
| * | | | | t5570: fix forwarding of git-daemon messages via cat | Johannes Sixt | 2012-04-27 | 1 | -11/+11 |
| |/ / / | |||||
* | | | | Merge branch 'kk/gitweb-omit-expensive' | Junio C Hamano | 2012-04-29 | 2 | -10/+32 |
|\ \ \ \ | |||||
| * | | | | gitweb: Option to not display information about owner | Kacper Kornet | 2012-04-26 | 2 | -6/+18 |
| * | | | | gitweb: Option to omit column with time of the last change | Kacper Kornet | 2012-04-25 | 2 | -5/+15 |
* | | | | | Merge branch 'kk/maint-gitweb-missing-owner' | Junio C Hamano | 2012-04-29 | 1 | -2/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | gitweb: Don't set owner if got empty value from projects.list | Kacper Kornet | 2012-04-25 | 1 | -2/+4 |
| |/ / / | |||||
* | | | | Merge branch 'rs/commit-list-append' | Junio C Hamano | 2012-04-29 | 4 | -45/+31 |
|\ \ \ \ | |||||
| * | | | | commit: remove commit_list_reverse() | René Scharfe | 2012-04-25 | 2 | -16/+0 |
| * | | | | revision: append to list instead of insert and reverse | René Scharfe | 2012-04-25 | 1 | -2/+2 |
| * | | | | sequencer: export commit_list_append() | René Scharfe | 2012-04-25 | 3 | -27/+29 |
* | | | | | Merge branch 'mm/include-userpath' | Junio C Hamano | 2012-04-29 | 3 | -1/+18 |
|\ \ \ \ \ | |||||
| * | | | | | config: expand tildes in include.path variable | Jeff King | 2012-04-29 | 3 | -1/+18 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'pw/t5800-import-race-fix' | Junio C Hamano | 2012-04-29 | 2 | -0/+20 |
|\ \ \ \ \ | |||||
| * | | | | | git-remote-testgit: fix race when spawning fast-import | Pete Wyckoff | 2012-04-24 | 2 | -0/+20 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jk/repack-no-explode-objects-from-old-pack' | Junio C Hamano | 2012-04-29 | 7 | -53/+107 |
|\ \ \ \ \ | |||||
| * | | | | | gc: use argv-array for sub-commands | Jeff King | 2012-04-18 | 1 | -45/+33 |
| * | | | | | argv-array: add a new "pushl" method | Jeff King | 2012-04-18 | 3 | -0/+17 |
| * | | | | | argv-array: refactor empty_argv initialization | Jeff King | 2012-04-18 | 2 | -3/+2 |
| * | | | | | gc: do not explode objects which will be immediately pruned | Jeff King | 2012-04-11 | 4 | -11/+61 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2012-04-29 | 1 | -2/+18 |
|\ \ \ \ \ | |||||
| * | | | | | git-svn: use platform specific auth providers | Matthijs Kooijman | 2012-04-27 | 1 | -2/+18 |
* | | | | | | The sixth batch of topics graduated to 'master' | Junio C Hamano | 2012-04-27 | 1 | -0/+24 |
* | | | | | | Merge branch 'jc/merge-reduce-parents-early' | Junio C Hamano | 2012-04-27 | 5 | -70/+275 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fmt-merge-msg: discard needless merge parents | Junio C Hamano | 2012-04-18 | 2 | -10/+149 |
| * | | | | | | builtin/merge.c: reduce parents early | Junio C Hamano | 2012-04-17 | 4 | -28/+43 |
| * | | | | | | builtin/merge.c: collect other parents early | Junio C Hamano | 2012-04-17 | 1 | -13/+27 |
| * | | | | | | builtin/merge.c: remove "remoteheads" global variable | Junio C Hamano | 2012-04-17 | 1 | -23/+28 |
| * | | | | | | merge tests: octopus with redundant parents | Michał Kiedrowicz | 2012-04-17 | 3 | -7/+39 |
* | | | | | | | Merge branch 'js/fast-import-test-9300' | Junio C Hamano | 2012-04-27 | 1 | -34/+54 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t9300-fast-import: avoid 'exit' in test_expect_success snippets | Johannes Sixt | 2012-04-20 | 1 | -34/+54 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rt/cherry-revert-conflict-summary' | Junio C Hamano | 2012-04-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sequencer: remove additional blank line | Ralf Thielow | 2012-04-19 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | |