summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t3200: fix failure on case-insensitive filesystemsjh/checkout-auto-trackingEric Sunshine2013-09-171-0/+1
* branch.c: Relax unnecessary requirement on upstream's remote ref namePer Cederqvist2013-09-092-3/+2
* t3200: Add test demonstrating minor regression in 41c21f2Johan Herland2013-09-091-0/+34
* Refer to branch.<name>.remote/merge when documenting --trackJohan Herland2013-09-091-2/+4
* t3200: Minor fix when preparing for tracking failureJohan Herland2013-09-091-1/+2
* t2024: Fix &&-chaining and a couple of typosJohan Herland2013-09-091-3/+3
* glossary: Update and rephrase the definition of a remote-tracking branchJohan Herland2013-04-211-6/+7
* branch.c: Validate tracking branches with refspecs instead of refs/remotes/*Johan Herland2013-04-213-3/+18
* t9114.2: Don't use --track option against "svn-remote"-tracking branchesJohan Herland2013-04-211-1/+1
* t7201.24: Add refspec to keep --track workingJohan Herland2013-04-211-0/+1
* t3200.39: tracking setup should fail if there is no matching refspec.Johan Herland2013-04-211-4/+4
* checkout: Use remote refspecs when DWIMming tracking branchesJohan Herland2013-04-213-26/+28
* t2024: Show failure to use refspec when DWIMming remote branch namesJohan Herland2013-04-211-1/+69
* t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'Johan Herland2013-04-211-0/+99
* Update draft release notes to 1.8.3Junio C Hamano2013-04-191-1/+27
* Merge branch 'jk/a-thread-only-dies-once'Junio C Hamano2013-04-193-6/+26
|\
| * run-command: use thread-aware die_is_recursing routineJeff King2013-04-161-0/+11
| * usage: allow pluggable die-recursion checksJeff King2013-04-162-6/+15
* | Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano2013-04-191-3/+3
|\ \
| * | t6200: avoid path mangling issue on WindowsJohannes Sixt2013-04-181-3/+3
* | | Merge branch 'mv/sequencer-pick-error-diag'Junio C Hamano2013-04-192-0/+24
|\ \ \
| * | | cherry-pick: make sure all input objects are commitsMiklos Vajna2013-04-112-0/+24
* | | | Merge branch 'tr/copy-revisions-from-stdin'Junio C Hamano2013-04-191-1/+2
|\ \ \ \
| * | | | read_revisions_from_stdin: make copies for handle_revision_argThomas Rast2013-04-161-1/+2
* | | | | Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part)Junio C Hamano2013-04-192-40/+95
|\ \ \ \ \
| * | | | | add -A: only show pathless 'add -A' warning when changes exist outside cwdJonathan Nieder2013-04-031-5/+16
| * | | | | add -u: only show pathless 'add -u' warning when changes exist outside cwdJonathan Nieder2013-04-032-4/+38
| * | | | | add: make warn_pathless_add() a no-op after first callJonathan Nieder2013-04-031-0/+5
| * | | | | add: add a blank line at the end of pathless 'add [-u|-A]' warningMatthieu Moy2013-04-031-1/+3
| * | | | | add: make pathless 'add [-u|-A]' warning a file-global functionJonathan Nieder2013-03-201-33/+36
* | | | | | Merge branch 'ap/strbuf-humanize'Junio C Hamano2013-04-196-40/+86
|\ \ \ \ \ \
| * | | | | | count-objects: add -H option to humanize sizesAntoine Pelisse2013-04-102-12/+46
| * | | | | | strbuf: create strbuf_humanise_bytes() to show byte sizesAntoine Pelisse2013-04-104-28/+40
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fc/branch-upstream-color'Junio C Hamano2013-04-192-9/+30
|\ \ \ \ \ \
| * | | | | | branch: colour upstream branchesFelipe Contreras2013-04-152-9/+30
* | | | | | | Merge branch 'mv/ssl-ftp-curl'Junio C Hamano2013-04-193-0/+27
|\ \ \ \ \ \ \
| * | | | | | | Support FTP-over-SSL/TLS for regular FTPModestas Vainius2013-04-123-0/+27
* | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-181-1/+25
* | | | | | | | Merge branch 'maint'Junio C Hamano2013-04-181-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-hg: fix commit messagesFelipe Contreras2013-04-171-1/+2
* | | | | | | | | Merge branch 'jk/test-trash'Junio C Hamano2013-04-181-9/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/test-lib.sh: drop "$test" variableJeff King2013-04-141-5/+5
| * | | | | | | | | t/test-lib.sh: fix TRASH_DIRECTORY handlingJohn Keeping2013-04-141-4/+4
* | | | | | | | | | Merge branch 'th/t9903-symlinked-workdir'Junio C Hamano2013-04-181-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t9903: Don't fail when run from path accessed through symlinkTorstein Hegge2013-04-111-5/+5
* | | | | | | | | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-04-182-23/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge-tree: don't print entries that match "local"John Keeping2013-04-082-23/+13
* | | | | | | | | | | | Merge branch 'jk/http-dumb-namespaces'Junio C Hamano2013-04-183-4/+63
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | http-backend: respect GIT_NAMESPACE with dumb clientsJohn Koleszar2013-04-093-4/+63
* | | | | | | | | | | | | Merge branch 'rs/empty-archive'Junio C Hamano2013-04-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \