Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | commit.c: check for lock error and return earlyrs/ref-update-check-errors-early | Ronnie Sahlberg | 2014-04-17 | 1 | -4/+4 |
* | sequencer.c: check for lock failure and bail early in fast_forward_to | Ronnie Sahlberg | 2014-04-17 | 1 | -0/+4 |
* | Update draft release notes for 2.0 | Junio C Hamano | 2014-04-16 | 1 | -0/+11 |
* | Merge branch 'mh/multimail' | Junio C Hamano | 2014-04-16 | 5 | -56/+249 |
|\ | |||||
| * | git-multimail: update to version 1.0.0mh/multimail | Michael Haggerty | 2014-04-07 | 5 | -56/+249 |
* | | Merge branch 'tb/unicode-6.3-zero-width' | Junio C Hamano | 2014-04-16 | 1 | -5/+4 |
|\ \ | |||||
| * | | utf8.c: partially update to version 6.3 | Torsten Bögershausen | 2014-04-09 | 1 | -5/+4 |
| |/ | |||||
* | | 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 |
| |/ / | |||||
* | | | Sync with 1.9.2 | Junio C Hamano | 2014-04-09 | 3 | -2/+23 |
|\ \ \ | |||||
| * | | | Git 1.9.2v1.9.2 | Junio C Hamano | 2014-04-09 | 3 | -2/+23 |
| * | | | Merge branch 'jl/nor-or-nand-and' into maint | Junio C Hamano | 2014-04-09 | 57 | -90/+88 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'cn/fetch-prune-overlapping-destination' into maint | Junio C Hamano | 2014-04-09 | 2 | -6/+64 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'mh/update-ref-batch-create-fix' into maint | Junio C Hamano | 2014-04-09 | 2 | -0/+12 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/commit-dates-parsing-fix' into maint | Junio C Hamano | 2014-04-09 | 5 | -4/+47 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maint | Junio C Hamano | 2014-04-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge commit 'doc/http-backend: missing accent grave in literal mark-up' | Junio C Hamano | 2014-04-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | doc/http-backend: missing accent grave in literal mark-up | Thomas Ackermann | 2014-04-09 | 1 | -1/+1 |
* | | | | | | | | | | Update draft release notes to 2.0 | Junio C Hamano | 2014-04-08 | 1 | -17/+11 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2014-04-08 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Update draft release notes to 1.9.2 | Junio C Hamano | 2014-04-08 | 1 | -0/+9 |
| * | | | | | | | | | Merge branch 'mm/status-porcelain-format-i18n-fix' into maint | Junio C Hamano | 2014-04-08 | 2 | -5/+9 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'bp/commit-p-editor' into maint | Junio C Hamano | 2014-04-08 | 10 | -39/+137 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/pack-bitmap' | Junio C Hamano | 2014-04-08 | 6 | -6/+56 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | pack-objects: do not reuse packfiles without --delta-base-offset | Jeff King | 2014-04-04 | 1 | -1/+12 |
| * | | | | | | | | | | | | add `ignore_missing_links` mode to revwalk | Vicent Marti | 2014-04-04 | 5 | -5/+44 |
* | | | | | | | | | | | | | Merge branch 'jl/nor-or-nand-and' | Junio C Hamano | 2014-04-08 | 57 | -90/+88 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | code and test: fix misuses of "nor"jl/nor-or-nand-and | Justin Lebar | 2014-03-31 | 12 | -16/+16 |
| * | | | | | | | | | | | | comments: fix misuses of "nor" | Justin Lebar | 2014-03-31 | 20 | -27/+26 |
| * | | | | | | | | | | | | contrib: fix misuses of "nor" | Justin Lebar | 2014-03-31 | 2 | -3/+3 |
| * | | | | | | | | | | | | Documentation: fix misuses of "nor" | Justin Lebar | 2014-03-31 | 25 | -44/+43 |
* | | | | | | | | | | | | | Merge branch 'mh/update-ref-batch-create-fix' | Junio C Hamano | 2014-04-08 | 2 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | update-ref: fail create operation over stdin if ref already existsmh/update-ref-batch-create-fix | Aman Gupta | 2014-04-02 | 2 | -0/+12 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'mr/opt-set-ptr' | Junio C Hamano | 2014-04-08 | 5 | -19/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | parse-options: remove unused OPT_SET_PTRmr/opt-set-ptr | Marat Radchenko | 2014-03-31 | 5 | -19/+4 |
| * | | | | | | | | | | | | parse-options: add cast to correct pointer type to OPT_SET_PTR | Junio C Hamano | 2014-03-31 | 2 | -2/+2 |
| * | | | | | | | | | | | | MSVC: fix t0040-parse-options crash | Marat Radchenko | 2014-03-31 | 1 | -1/+1 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'ib/rev-parse-parseopt-argh' | Junio C Hamano | 2014-04-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | rev-parse: fix typo in example on manpageib/rev-parse-parseopt-argh | René Scharfe | 2014-04-01 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'mr/msvc-link-with-invalidcontinue' | Junio C Hamano | 2014-04-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | MSVC: link in invalidcontinue.obj for better POSIX compatibilitymr/msvc-link-with-invalidcontinue | Marat Radchenko | 2014-03-28 | 1 | -1/+1 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' | Junio C Hamano | 2014-04-08 | 17 | -29/+77 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | parse-options: make sure argh string does not have SP or _ | Junio C Hamano | 2014-03-24 | 1 | -0/+3 |
| * | | | | | | | | | | | | | update-index: teach --cacheinfo a new syntax "mode,sha1,path" | Junio C Hamano | 2014-03-24 | 3 | -5/+50 |
| * | | | | | | | | | | | | | parse-options: multi-word argh should use dash to separate words | Junio C Hamano | 2014-03-24 | 13 | -24/+24 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jk/commit-dates-parsing-fix' | Junio C Hamano | 2014-04-08 | 5 | -4/+47 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | t4212: loosen far-in-future test for AIXjk/commit-dates-parsing-fix | Jeff King | 2014-04-01 | 1 | -4/+2 |
| * | | | | | | | | | | | | date: recognize bogus FreeBSD gmtime output | Jeff King | 2014-04-01 | 4 | -0/+45 |