Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tr/sha1-file-silence-loose-object-info-under-prune-race' | Junio C Hamano | 2013-06-11 | 1 | -1/+1 |
|\ | |||||
| * | sha1_file: silence sha1_loose_object_info | Thomas Rast | 2013-06-03 | 1 | -1/+1 |
* | | Merge branch 'nd/warn-ambiguous-object-name' | Junio C Hamano | 2013-06-11 | 4 | -2/+44 |
|\ \ | |||||
| * | | get_sha1: warn about full or short object names that look like refs | Nguyễn Thái Ngọc Duy | 2013-05-29 | 4 | -2/+44 |
* | | | Merge branch 'rr/diffcore-pickaxe-doc' | Junio C Hamano | 2013-06-11 | 3 | -28/+59 |
|\ \ \ | |||||
| * | | | diffcore-pickaxe doc: document -S and -G properly | Ramkumar Ramachandra | 2013-06-03 | 2 | -26/+57 |
| * | | | diffcore-pickaxe: make error messages more consistent | Ramkumar Ramachandra | 2013-06-03 | 1 | -2/+2 |
* | | | | Merge branch 'cr/git-work-tree-sans-git-dir' | Junio C Hamano | 2013-06-11 | 1 | -3/+1 |
|\ \ \ \ | |||||
| * | | | | git.txt: remove stale comment regarding GIT_WORK_TREE | Chris Rorvick | 2013-06-03 | 1 | -3/+1 |
* | | | | | Merge branch 'mm/mediawiki-https-fail-message' | Junio C Hamano | 2013-06-11 | 1 | -8/+18 |
|\ \ \ \ \ | |||||
| * | | | | | git-remote-mediawiki: better error message when HTTP(S) access fails | Matthieu Moy | 2013-05-29 | 1 | -8/+18 |
* | | | | | | Merge branch 'cb/log-follow-with-combined' | Junio C Hamano | 2013-06-11 | 2 | -0/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix segfault with git log -c --follow | Clemens Buchacher | 2013-05-28 | 2 | -0/+17 |
* | | | | | | | Merge branch 'xq/credential-osxkeychain' | Junio C Hamano | 2013-06-11 | 1 | -1/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | credential-osxkeychain: support more protocols | Xidorn Quan | 2013-05-28 | 1 | -1/+11 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fc/do-not-use-the-index-in-add-to-index' | Junio C Hamano | 2013-06-11 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | read-cache: trivial style cleanups | Felipe Contreras | 2013-06-03 | 1 | -2/+2 |
| * | | | | | | | read-cache: fix wrong 'the_index' usage | Felipe Contreras | 2013-06-03 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fc/remote-bzr' | Junio C Hamano | 2013-06-11 | 1 | -57/+55 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remote-bzr: add fallback check for a partial clone | Felipe Contreras | 2013-05-28 | 1 | -1/+4 |
| * | | | | | | | remote-bzr: reorganize the way 'wanted' works | Felipe Contreras | 2013-05-28 | 1 | -32/+26 |
| * | | | | | | | remote-bzr: trivial cleanups | Felipe Contreras | 2013-05-28 | 1 | -7/+7 |
| * | | | | | | | remote-bzr: change global repo | Felipe Contreras | 2013-05-28 | 1 | -2/+2 |
| * | | | | | | | remote-bzr: delay cloning/pulling | Felipe Contreras | 2013-05-28 | 1 | -15/+13 |
| * | | | | | | | remote-bzr: simplify get_remote_branch() | Felipe Contreras | 2013-05-28 | 1 | -11/+12 |
| * | | | | | | | remote-bzr: fix for files with spaces | Felipe Contreras | 2013-05-28 | 1 | -1/+1 |
| * | | | | | | | remote-bzr: recover from failed clones | Felipe Contreras | 2013-05-28 | 1 | -8/+10 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fc/remote-hg' | Junio C Hamano | 2013-06-11 | 6 | -522/+1300 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remote-hg: add support for --force | Felipe Contreras | 2013-05-28 | 2 | -13/+50 |
| * | | | | | | | remote-hg: add support for --dry-run | Felipe Contreras | 2013-05-28 | 2 | -2/+65 |
| * | | | | | | | remote-hg: check if a fetch is needed | Felipe Contreras | 2013-05-28 | 2 | -1/+109 |
| * | | | | | | | remote-hg: trivial cleanup | Felipe Contreras | 2013-05-28 | 1 | -7/+4 |
| * | | | | | | | remote-helpers: improve marks usage | Felipe Contreras | 2013-05-28 | 2 | -3/+9 |
| * | | | | | | | remote-hg: add check_push() helper | Felipe Contreras | 2013-05-28 | 1 | -17/+49 |
| * | | | | | | | remote-hg: add setup_big_push() helper | Felipe Contreras | 2013-05-28 | 1 | -4/+11 |
| * | | | | | | | remote-hg: remove files before modifications | Felipe Contreras | 2013-05-28 | 1 | -2/+2 |
| * | | | | | | | remote-hg: improve lightweight tag author | Felipe Contreras | 2013-05-28 | 1 | -4/+14 |
| * | | | | | | | remote-hg: use remote 'default' not local one | Felipe Contreras | 2013-05-28 | 2 | -11/+10 |
| * | | | | | | | remote-hg: improve branch listing | Felipe Contreras | 2013-05-28 | 1 | -3/+6 |
| * | | | | | | | remote-hg: simplify branch_tip() | Felipe Contreras | 2013-05-28 | 1 | -8/+4 |
| * | | | | | | | remote-hg: check diverged bookmarks | Felipe Contreras | 2013-05-28 | 2 | -1/+25 |
| * | | | | | | | remote-hg: pass around revision refs | Felipe Contreras | 2013-05-28 | 2 | -16/+24 |
| * | | | | | | | remote-hg: implement custom checkheads() | Felipe Contreras | 2013-05-28 | 1 | -3/+49 |
| * | | | | | | | remote-hg: implement custom push() | Felipe Contreras | 2013-05-28 | 1 | -2/+42 |
| * | | | | | | | remote-hg: only update necessary revisions | Felipe Contreras | 2013-05-28 | 1 | -2/+7 |
| * | | | | | | | remote-hg: force remote bookmark push selectively | Felipe Contreras | 2013-05-28 | 1 | -1/+2 |
| * | | | | | | | remote-hg: reorganize bookmark handling | Felipe Contreras | 2013-05-28 | 1 | -31/+19 |
| * | | | | | | | remote-hg: add test for failed double push | Felipe Contreras | 2013-05-28 | 1 | -0/+24 |
| * | | | | | | | remote-hg: add test for big push | Felipe Contreras | 2013-05-28 | 1 | -6/+107 |
| * | | | | | | | remote-hg: add test for new bookmark special | Felipe Contreras | 2013-05-28 | 1 | -0/+15 |