Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | push: truly use "simple" as default, not "upstream"jk/push-simple | Jeff King | 2014-11-30 | 1 | -2/+30 |
* | Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)" | Junio C Hamano | 2014-05-20 | 1 | -8/+23 |
* | Merge branch 'jc/graduate-remote-hg-bzr' (early part) | Junio C Hamano | 2014-05-19 | 1 | -23/+8 |
|\ | |||||
| * | Revert "Merge branch 'fc/transport-helper-sync-error-fix'" | Junio C Hamano | 2014-05-19 | 1 | -23/+8 |
* | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' | Junio C Hamano | 2014-05-19 | 1 | -3/+3 |
|\ \ | |||||
| * | | git-prompt.sh: don't assume the shell expands the value of PS1rh/prompt-pcmode-avoid-eval-on-refname | Richard Hansen | 2014-05-19 | 1 | -3/+3 |
* | | | Merge branch 'lt/request-pull' | Junio C Hamano | 2014-05-19 | 1 | -1/+7 |
|\ \ \ | |_|/ |/| | | |||||
| * | | request-pull: resurrect for-linus -> tags/for-linus DWIM | Junio C Hamano | 2014-05-16 | 1 | -1/+7 |
* | | | Merge branch 'km/git-svn-workaround-older-getopt-long' | Junio C Hamano | 2014-05-02 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | t9117: use --prefix "" instead of --prefix=""km/git-svn-workaround-older-getopt-long | Kyle J. McKay | 2014-04-23 | 1 | -4/+4 |
* | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' | Junio C Hamano | 2014-05-02 | 1 | -22/+22 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | git-prompt.sh: don't put unsanitized branch names in $PS1 | Richard Hansen | 2014-04-22 | 1 | -22/+22 |
* | | | | Merge branch 'fc/transport-helper-sync-error-fix' | Junio C Hamano | 2014-04-24 | 1 | -8/+23 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | t5801 (remote-helpers): cleanup environment setsfc/transport-helper-sync-error-fix | Felipe Contreras | 2014-04-21 | 1 | -7/+4 |
| * | | | transport-helper: fix sync issue on crashes | Felipe Contreras | 2014-04-14 | 1 | -1/+19 |
* | | | | Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given | Johan Herland | 2014-04-19 | 18 | -126/+126 |
* | | | | Merge branch 'km/avoid-cp-a' | Junio C Hamano | 2014-04-16 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | test: fix t7001 cp to use POSIX optionskm/avoid-cp-a | Kyle J. McKay | 2014-04-11 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'km/avoid-bs-in-shell-glob' | Junio C Hamano | 2014-04-16 | 1 | -2/+2 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | test: fix t5560 on FreeBSDkm/avoid-bs-in-shell-glob | Kyle J. McKay | 2014-04-11 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'jk/pack-bitmap' | Junio C Hamano | 2014-04-08 | 1 | -0/+31 |
|\ \ \ | |||||
| * | | | add `ignore_missing_links` mode to revwalk | Vicent Marti | 2014-04-04 | 1 | -0/+31 |
* | | | | Merge branch 'jl/nor-or-nand-and' | Junio C Hamano | 2014-04-08 | 7 | -7/+7 |
|\ \ \ \ | |||||
| * | | | | code and test: fix misuses of "nor"jl/nor-or-nand-and | Justin Lebar | 2014-03-31 | 7 | -7/+7 |
| * | | | | Merge branch 'jk/clean-d-pathspec' into maint | Junio C Hamano | 2014-03-18 | 1 | -0/+16 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'da/difftool-git-files' into maint | Junio C Hamano | 2014-03-18 | 1 | -0/+14 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/remote-pushremote-config-reading' into maint | Junio C Hamano | 2014-03-18 | 1 | -0/+13 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/commit-dates-parsing-fix' into maint | Junio C Hamano | 2014-03-18 | 2 | -0/+59 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint | Junio C Hamano | 2014-03-18 | 1 | -1/+29 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/reset-setup-worktree' into maint | Junio C Hamano | 2014-03-18 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/check-attr-honor-working-tree' into maint | Junio C Hamano | 2014-03-18 | 1 | -22/+40 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint | Junio C Hamano | 2014-03-18 | 1 | -0/+47 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/diff-quiet-stat-dirty' into maint | Junio C Hamano | 2014-03-18 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/http-fetch-shallow-fix' into maint | Junio C Hamano | 2014-03-18 | 9 | -35/+83 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maint | Junio C Hamano | 2014-03-18 | 2 | -3/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/update-ref-batch-create-fix' | Junio C Hamano | 2014-04-08 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | update-ref: fail create operation over stdin if ref already existsmh/update-ref-batch-create-fix | Aman Gupta | 2014-04-02 | 1 | -0/+11 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge branch 'mr/opt-set-ptr' | Junio C Hamano | 2014-04-08 | 1 | -4/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | parse-options: remove unused OPT_SET_PTRmr/opt-set-ptr | Marat Radchenko | 2014-03-31 | 1 | -4/+3 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' | Junio C Hamano | 2014-04-08 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | update-index: teach --cacheinfo a new syntax "mode,sha1,path" | Junio C Hamano | 2014-03-24 | 1 | -0/+13 |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/commit-dates-parsing-fix' | Junio C Hamano | 2014-04-08 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | t4212: loosen far-in-future test for AIXjk/commit-dates-parsing-fix | Jeff King | 2014-04-01 | 1 | -4/+2 |
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'cb/aix' | Junio C Hamano | 2014-04-03 | 2 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | tests: don't rely on strerror text when testing rmdir failurecb/aix | Charles Bailey | 2014-03-31 | 2 | -4/+2 |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'cn/fetch-prune-overlapping-destination' | Junio C Hamano | 2014-04-03 | 1 | -0/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | fetch: handle overlaping refspecs on --prunecn/fetch-prune-overlapping-destination | Carlos Martín Nieto | 2014-03-26 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | fetch: add a failing test for prunning with overlapping refspecs | Carlos Martín Nieto | 2014-02-28 | 1 | -0/+20 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'rs/pickaxe-i' | Junio C Hamano | 2014-04-02 | 1 | -102/+64 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | pickaxe: honor -i when used with -S and --pickaxe-regex | René Scharfe | 2014-03-24 | 1 | -0/+5 |