summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/add-2.0-delete-default' (early part)Junio C Hamano2013-04-223-32/+103
|\
| * git add: rephrase the "removal will cease to be ignored" warningJunio C Hamano2013-04-211-7/+14
| * git add: rework the logic to warn "git add <pathspec>..." default changeJunio C Hamano2013-04-171-26/+38
| * git add: start preparing for "git add <pathspec>..." to default to "-A"Junio C Hamano2013-03-083-6/+59
| * builtin/add.c: simplify boolean variablesJunio C Hamano2013-03-081-11/+11
* | Merge branch 'nd/checkout-keep-sparse'Junio C Hamano2013-04-225-1/+40
|\ \
| * | checkout: add --ignore-skip-worktree-bits in sparse checkout modeNguyễn Thái Ngọc Duy2013-04-155-1/+40
* | | Merge branch 'jk/chopped-ident'Junio C Hamano2013-04-225-99/+75
|\ \ \
| * | | blame: handle broken commit headers gracefullyRené Scharfe2013-04-171-3/+8
| * | | pretty: handle broken commit headers gracefullyRené Scharfe2013-04-172-21/+66
| * | | cat-file: print tags raw for "cat-file -p"Jeff King2013-04-172-75/+1
* | | | Merge branch 'th/bisect-final-log'Junio C Hamano2013-04-222-1/+25
|\ \ \ \
| * | | | bisect: Store first bad commit as comment in log fileTorstein Hegge2013-04-152-1/+25
| | |/ / | |/| |
* | | | Merge branch 'rs/archive-zip-raw-compression'Junio C Hamano2013-04-221-2/+2
|\ \ \ \
| * | | | zlib: fix compilation failures with Sun C CompilaerStefano Lattarini2013-04-221-2/+2
* | | | | Merge branch 'ta/glossary'Junio C Hamano2013-04-2132-111/+89
|\ \ \ \ \
| * | | | | glossary: improve definitions of refspec and pathspecThomas Ackermann2013-04-151-23/+10
| * | | | | The name of the hash function is "SHA-1", not "SHA1"Thomas Ackermann2013-04-1531-68/+68
| * | | | | glossary: improve description of SHA-1 related topicsThomas Ackermann2013-04-151-10/+10
| * | | | | glossary: remove outdated/misleading/irrelevant entriesThomas Ackermann2013-04-151-10/+1
* | | | | | Merge branch 'jk/doc-http-backend'Junio C Hamano2013-04-213-1/+129
|\ \ \ \ \ \
| * | | | | | doc/http-backend: match query-string in apache half-auth exampleJeff King2013-04-133-8/+72
| * | | | | | doc/http-backend: give some lighttpd config examplesJeff King2013-04-111-0/+55
| * | | | | | doc/http-backend: clarify "half-auth" repo configurationJeff King2013-04-111-0/+9
* | | | | | | Merge branch 'jx/i18n-branch-error-messages'Junio C Hamano2013-04-211-27/+27
|\ \ \ \ \ \ \
| * | | | | | | i18n: branch: mark strings for translationJiang Xin2013-04-151-27/+27
* | | | | | | | Merge branch 'fc/remote-hg'Junio C Hamano2013-04-214-29/+148
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-hg: activate graphlog extension for hg_log()Antoine Pelisse2013-04-112-2/+7
| * | | | | | | | remote-hg: fix bad file pathsFelipe Contreras2013-04-111-2/+8
| * | | | | | | | remote-hg: document location of stored hg repositorySimon Ruderich2013-04-111-0/+3
| * | | | | | | | remote-hg: fix bad state issueFelipe Contreras2013-04-111-1/+7
| * | | | | | | | remote-hg: add 'insecure' optionSimon Ruderich2013-04-111-0/+9
| * | | | | | | | remote-hg: add simple mail testFelipe Contreras2013-04-111-1/+2
| * | | | | | | | remote-hg: add basic author testsFelipe Contreras2013-04-111-0/+35
| * | | | | | | | remote-hg: show more proper errorsFelipe Contreras2013-04-111-3/+9
| * | | | | | | | remote-hg: force remote pushFelipe Contreras2013-04-111-2/+9
| * | | | | | | | remote-hg: push to the appropriate branchDusty Phillips2013-04-111-0/+4
| * | | | | | | | remote-hg: update tags globallyFelipe Contreras2013-04-111-1/+5
| * | | | | | | | remote-hg: update remote bookmarksFelipe Contreras2013-04-111-0/+5
| * | | | | | | | remote-hg: refactor exportFelipe Contreras2013-04-111-8/+12
| * | | | | | | | remote-hg: split bookmark handlingFelipe Contreras2013-04-111-14/+25
| * | | | | | | | remote-hg: redirect buggy mercurial outputFelipe Contreras2013-04-111-0/+1
| * | | | | | | | remote-hg: trivial test cleanupsFelipe Contreras2013-04-112-5/+3
| * | | | | | | | remote-hg: make sure fake bookmarks are updatedFelipe Contreras2013-04-113-0/+9
| * | | | | | | | remote-hg: fix for files with spacesPeter van Zetten2013-04-111-2/+2
| * | | | | | | | remote-hg: properly report errors on bookmark pushesFelipe Contreras2013-04-111-0/+1
| * | | | | | | | remote-hg: add missing config variable in docDusty Phillips2013-04-111-0/+4
| * | | | | | | | remote-hg: trivial cleanupsFelipe Contreras2013-04-111-5/+5
* | | | | | | | | Merge branch 'lf/read-blob-data-from-index'Junio C Hamano2013-04-214-59/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | convert.c: remove duplicate codeLukas Fleischer2013-04-171-25/+2