Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | get_octopus_merge_bases(): cleanup redundant variablevm/octopus-merge-bases-simplify | Vasily Makarov | 2014-01-03 | 1 | -18/+18 |
* | Merge branch 'maint' | Junio C Hamano | 2013-12-30 | 1 | -2/+1 |
|\ | |||||
| * | for-each-ref: remove unused variable | Ramkumar Ramachandra | 2013-12-30 | 1 | -2/+1 |
* | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2013-12-27 | 1 | -2/+8 |
|\ \ | |||||
| * | | git-svn: workaround for a bug in svn serf backend | Roman Kagan | 2013-12-27 | 1 | -2/+8 |
* | | | Merge branch 'fc/remote-helper-fixes' | Junio C Hamano | 2013-12-27 | 3 | -9/+103 |
|\ \ \ | |||||
| * | | | remote-hg: test 'shared_path' in a moved clone | Antoine Pelisse | 2013-12-26 | 1 | -0/+11 |
| * | | | remote-hg: add tests for special filenames | Felipe Contreras | 2013-12-09 | 1 | -0/+68 |
| * | | | remote-hg: fix 'shared path' path | Felipe Contreras | 2013-12-09 | 1 | -0/+3 |
| * | | | remote-helpers: add extra safety checks | Felipe Contreras | 2013-12-09 | 2 | -8/+20 |
| * | | | remote-hg: avoid buggy strftime() | jcb91 | 2013-12-09 | 1 | -1/+1 |
* | | | | Merge branch 'js/gnome-keyring' | Junio C Hamano | 2013-12-27 | 1 | -46/+39 |
|\ \ \ \ | |||||
| * | | | | contrib/git-credential-gnome-keyring.c: small stylistic cleanupsjs/gnome-keyring | John Szakmeister | 2013-12-16 | 1 | -46/+39 |
* | | | | | Merge branch 'jk/name-pack-after-byte-representation' | Junio C Hamano | 2013-12-27 | 6 | -16/+9 |
|\ \ \ \ \ | |||||
| * | | | | | pack-objects doc: treat output filename as opaquejk/name-pack-after-byte-representation | Jeff King | 2013-12-16 | 1 | -2/+1 |
| * | | | | | pack-objects: name pack files after trailer hash | Jeff King | 2013-12-05 | 3 | -10/+4 |
| * | | | | | sha1write: make buffer const-correct | Jeff King | 2013-10-24 | 2 | -4/+4 |
* | | | | | | Merge branch 'tg/diff-no-index-refactor' | Junio C Hamano | 2013-12-27 | 5 | -49/+103 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: avoid some nestingtg/diff-no-index-refactor | Thomas Gummerer | 2013-12-16 | 1 | -18/+17 |
| * | | | | | | diff: add test for --no-index executed outside repo | Thomas Gummerer | 2013-12-16 | 1 | -0/+11 |
| * | | | | | | diff: don't read index when --no-index is given | Thomas Gummerer | 2013-12-12 | 3 | -2/+42 |
| * | | | | | | diff: move no-index detection to builtin/diff.c | Thomas Gummerer | 2013-12-12 | 3 | -47/+51 |
* | | | | | | | Merge branch 'zk/difftool-counts' | Junio C Hamano | 2013-12-27 | 5 | -4/+43 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff.c: fix some recent whitespace style violationszk/difftool-counts | Jeff King | 2013-12-16 | 1 | -2/+2 |
| * | | | | | | | difftool: display the number of files in the diff queue in the prompt | Zoltan Klinger | 2013-12-06 | 5 | -4/+43 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/cat-file-regression-fix' | Junio C Hamano | 2013-12-27 | 2 | -10/+42 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cat-file: handle --batch format with missing type/sizejk/cat-file-regression-fix | Jeff King | 2013-12-12 | 2 | -1/+32 |
| * | | | | | | | cat-file: pass expand_data to print_object_or_die | Jeff King | 2013-12-12 | 1 | -10/+11 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/pull-rebase-using-fork-point' | Junio C Hamano | 2013-12-27 | 4 | -11/+34 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase: use reflog to find common base with upstream | John Keeping | 2013-12-10 | 3 | -2/+33 |
| * | | | | | | | pull: use merge-base --fork-point when appropriate | John Keeping | 2013-12-09 | 1 | -9/+1 |
* | | | | | | | | Merge branch 'jk/rev-parse-double-dashes' | Junio C Hamano | 2013-12-27 | 2 | -1/+39 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rev-parse: be more careful with munging argumentsjk/rev-parse-double-dashes | Jeff King | 2013-12-09 | 1 | -1/+5 |
| * | | | | | | | | rev-parse: correctly diagnose revision errors before "--" | Jeff King | 2013-12-09 | 2 | -0/+34 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/push-refmap' | Junio C Hamano | 2013-12-27 | 5 | -28/+150 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | push: also use "upstream" mapping when pushing a single refjc/push-refmap | Junio C Hamano | 2013-12-04 | 2 | -0/+41 |
| * | | | | | | | push: use remote.$name.push as a refmap | Junio C Hamano | 2013-12-04 | 5 | -8/+96 |
| * | | | | | | | builtin/push.c: use strbuf instead of manual allocation | Junio C Hamano | 2013-12-03 | 1 | -21/+14 |
* | | | | | | | | Sync with 1.8.5.2 | Junio C Hamano | 2013-12-17 | 3 | -5/+24 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Git 1.8.5.2v1.8.5.2 | Junio C Hamano | 2013-12-17 | 4 | -3/+24 |
| * | | | | | | | Merge branch 'rs/doc-submitting-patches' into maint | Junio C Hamano | 2013-12-17 | 1 | -2/+9 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'tr/doc-git-cherry' into maint | Junio C Hamano | 2013-12-17 | 1 | -33/+110 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/glossary-content-pathspec-markup' into maint | Junio C Hamano | 2013-12-17 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jj/doc-markup-gitcli' into maint | Junio C Hamano | 2013-12-17 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jj/doc-markup-hints-in-coding-guidelines' into maint | Junio C Hamano | 2013-12-17 | 1 | -3/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jj/log-doc' into maint | Junio C Hamano | 2013-12-17 | 1 | -26/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jj/rev-list-options-doc' into maint | Junio C Hamano | 2013-12-17 | 1 | -156/+87 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tb/doc-fetch-pack-url' into maint | Junio C Hamano | 2013-12-17 | 1 | -8/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mi/typofixes' into maint | Junio C Hamano | 2013-12-17 | 8 | -10/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/loose-object-dirs-creation-race' into maint | Junio C Hamano | 2013-12-17 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |