aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* remove superfluous newlines in error messagesPete Wyckoff2012-04-30
* Merge branch 'ld/git-p4-tags-and-labels'Junio C Hamano2012-04-30
|\
| * git p4: fix unit testsLuke Diamand2012-04-25
| * git p4: move verbose to base classLuke Diamand2012-04-24
| * git p4: Ignore P4EDITOR if it is emptyLuke Diamand2012-04-24
| * git p4: Squash P4EDITOR in test harnessLuke Diamand2012-04-24
| * git p4: fix-up "import/export of labels to/from p4"Luke Diamand2012-04-24
| * git p4: import/export of labels to/from p4Luke Diamand2012-04-11
| * git p4: Fixing script editor checksLuke Diamand2012-04-11
* | Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-30
|\ \
| * | git-rebase: add keep_empty flagNeil Horman2012-04-24
| * | git-cherry-pick: Add test to validate new optionsNeil Horman2012-04-24
| * | git-cherry-pick: Add keep-redundant-commits optionNeil Horman2012-04-24
| * | git-cherry-pick: add allow-empty optionNeil Horman2012-04-11
* | | Merge branch 'jk/maint-config-bogus-section'Junio C Hamano2012-04-30
|\ \ \
| * | | config: reject bogus section names for --rename-sectionJeff King2012-04-25
* | | | The seventh batch of topics graduated to 'master'Junio C Hamano2012-04-29
* | | | Merge branch 'js/daemon-test-race-fix'Junio C Hamano2012-04-29
|\ \ \ \
| * | | | t5570: fix forwarding of git-daemon messages via catJohannes Sixt2012-04-27
| |/ / /
* | | | Merge branch 'kk/gitweb-omit-expensive'Junio C Hamano2012-04-29
|\ \ \ \
| * | | | gitweb: Option to not display information about ownerKacper Kornet2012-04-26
| * | | | gitweb: Option to omit column with time of the last changeKacper Kornet2012-04-25
* | | | | Merge branch 'kk/maint-gitweb-missing-owner'Junio C Hamano2012-04-29
|\ \ \ \ \ | |/ / / /
| * | | | gitweb: Don't set owner if got empty value from projects.listKacper Kornet2012-04-25
| |/ / /
* | | | Merge branch 'rs/commit-list-append'Junio C Hamano2012-04-29
|\ \ \ \
| * | | | commit: remove commit_list_reverse()René Scharfe2012-04-25
| * | | | revision: append to list instead of insert and reverseRené Scharfe2012-04-25
| * | | | sequencer: export commit_list_append()René Scharfe2012-04-25
* | | | | Merge branch 'mm/include-userpath'Junio C Hamano2012-04-29
|\ \ \ \ \
| * | | | | config: expand tildes in include.path variableJeff King2012-04-29
| | |_|/ / | |/| | |
* | | | | Merge branch 'pw/t5800-import-race-fix'Junio C Hamano2012-04-29
|\ \ \ \ \
| * | | | | git-remote-testgit: fix race when spawning fast-importPete Wyckoff2012-04-24
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/repack-no-explode-objects-from-old-pack'Junio C Hamano2012-04-29
|\ \ \ \ \
| * | | | | gc: use argv-array for sub-commandsJeff King2012-04-18
| * | | | | argv-array: add a new "pushl" methodJeff King2012-04-18
| * | | | | argv-array: refactor empty_argv initializationJeff King2012-04-18
| * | | | | gc: do not explode objects which will be immediately prunedJeff King2012-04-11
| | |/ / / | |/| | |
* | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2012-04-29
|\ \ \ \ \
| * | | | | git-svn: use platform specific auth providersMatthijs Kooijman2012-04-27
* | | | | | The sixth batch of topics graduated to 'master'Junio C Hamano2012-04-27
* | | | | | Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-27
|\ \ \ \ \ \
| * | | | | | fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-18
| * | | | | | builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-17
| * | | | | | builtin/merge.c: collect other parents earlyJunio C Hamano2012-04-17
| * | | | | | builtin/merge.c: remove "remoteheads" global variableJunio C Hamano2012-04-17
| * | | | | | merge tests: octopus with redundant parentsMichał Kiedrowicz2012-04-17
* | | | | | | Merge branch 'js/fast-import-test-9300'Junio C Hamano2012-04-27
|\ \ \ \ \ \ \
| * | | | | | | t9300-fast-import: avoid 'exit' in test_expect_success snippetsJohannes Sixt2012-04-20
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rt/cherry-revert-conflict-summary'Junio C Hamano2012-04-27
|\ \ \ \ \ \ \
| * | | | | | | sequencer: remove additional blank lineRalf Thielow2012-04-19
| | |_|_|/ / / | |/| | | | |