summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | git p4: fix sync --branch when no master branchPete Wyckoff2013-01-153-7/+20
| * | | | | | git p4: fail gracefully on sync with no master branchPete Wyckoff2013-01-152-7/+31
| * | | | | | git p4: rearrange self.initialParent usePete Wyckoff2013-01-151-3/+9
| * | | | | | git p4: allow short ref names to --branchPete Wyckoff2013-01-153-3/+37
| * | | | | | git p4 doc: fix branch detection examplePete Wyckoff2013-01-151-1/+3
| * | | | | | git p4: clone --branch should checkout masterPete Wyckoff2013-01-153-14/+11
| * | | | | | git p4: verify expected refs in clone --bare testPete Wyckoff2013-01-151-3/+6
| * | | | | | git p4: create p4/HEAD on initial clonePete Wyckoff2013-01-152-4/+31
| * | | | | | git p4: inline listExistingP4GitBranchesPete Wyckoff2013-01-151-8/+6
| * | | | | | git p4: add comments to p4BranchesInGitPete Wyckoff2013-01-151-8/+17
| * | | | | | git p4: rearrange and simplify hasOrigin handlingPete Wyckoff2013-01-151-7/+7
| * | | | | | git p4: test sync/clone --branch behaviorPete Wyckoff2013-01-151-4/+49
* | | | | | | Merge branch 'mh/remote-hg-mode-bits-fix'Junio C Hamano2013-01-222-1/+69
|\ \ \ \ \ \ \
| * | | | | | | remote-hg: fix handling of file perms when pushingMax Horn2013-01-152-1/+69
* | | | | | | | Merge branch 'fc/remote-hg-fixup-url'Junio C Hamano2013-01-221-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-hg: store converted URLFelipe Contreras2013-01-151-0/+11
| |/ / / / / / /
* | | | | | | | Merge branch 'zk/clean-report-failure'Junio C Hamano2013-01-221-29/+125
|\ \ \ \ \ \ \ \
| * | | | | | | | git-clean: Display more accurate delete messagesZoltan Klinger2013-01-141-29/+125
* | | | | | | | | Merge branch 'ph/rebase-preserve-all-merges'Junio C Hamano2013-01-221-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase --preserve-merges: keep all merge commits including empty onesPhil Hord2013-01-141-1/+6
* | | | | | | | | | Merge branch 'nd/clone-no-separate-git-dir-with-bare'Junio C Hamano2013-01-221-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | clone: forbid --bare --separate-git-dir <dir>Nguyễn Thái Ngọc Duy2013-01-111-0/+2
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-01-221-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-for-each-ref.txt: 'raw' is a supported date formatJohn Keeping2013-01-221-1/+1
* | | | | | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-01-211-0/+7
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-01-211-0/+13
|\| | | | | | | | | |
| * | | | | | | | | | Start preparing for 1.8.1.2Junio C Hamano2013-01-212-1/+14
| * | | | | | | | | | Merge branch 'nz/send-email-headers-are-case-insensitive' into maintJunio C Hamano2013-01-211-5/+5
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/zip-with-uncompressed-size-in-the-header' into maintJunio C Hamano2013-01-211-5/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/zip-tests' into maintJunio C Hamano2013-01-215-80/+140
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2013-01-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-svn: do not escape certain characters in pathsPeter Wu2013-01-191-1/+2
* | | | | | | | | | | | | | Merge branch 'rt/commit-cleanup-config'Junio C Hamano2013-01-215-9/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | commit: make default of "cleanup" option configurableRalf Thielow2013-01-105-9/+97
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ap/log-mailmap'Junio C Hamano2013-01-2115-229/+393
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | log --use-mailmap: optimize for cases without --author/--committer searchJunio C Hamano2013-01-101-1/+1
| * | | | | | | | | | | | | log: add log.mailmap configuration optionAntoine Pelisse2013-01-103-0/+35
| * | | | | | | | | | | | | log: grep author/committer using mailmapAntoine Pelisse2013-01-102-0/+72
| * | | | | | | | | | | | | test: add test for --use-mailmap optionAntoine Pelisse2013-01-101-0/+14
| * | | | | | | | | | | | | log: add --use-mailmap optionAntoine Pelisse2013-01-102-1/+13
| * | | | | | | | | | | | | pretty: use mailmap to display username and emailAntoine Pelisse2013-01-101-21/+37
| * | | | | | | | | | | | | mailmap: add mailmap structure to rev_info and ppAntoine Pelisse2013-01-103-0/+3
| * | | | | | | | | | | | | mailmap: simplify map_user() interfaceAntoine Pelisse2013-01-105-144/+126
| * | | | | | | | | | | | | mailmap: remove email copy and length limitationJunio C Hamano2013-01-101-16/+59
| * | | | | | | | | | | | | Use split_ident_line to parse author and committerAntoine Pelisse2013-01-083-78/+52
| * | | | | | | | | | | | | string-list: allow case-insensitive string listJunio C Hamano2013-01-082-4/+17
* | | | | | | | | | | | | | Merge git://bogomips.org/git-svnJunio C Hamano2013-01-184-5/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-svn: teach find-rev to find near matchesJohn Keeping2013-01-182-2/+20
| * | | | | | | | | | | | | | git svn: do not overescape URLs (fallback case)Jonathan Nieder2013-01-181-1/+1
| * | | | | | | | | | | | | | Git::SVN::Editor::T: pass $deletions to ->A and ->DJonathan Nieder2013-01-181-2/+2
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |