Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | wincred: avoid overwriting configured variables | Pat Thoyts | 2014-05-14 | 1 | -4/+4 |
* | wincred: add install target | Pat Thoyts | 2014-05-14 | 1 | -0/+8 |
* | Git 1.9.3v1.9.3 | Junio C Hamano | 2014-05-09 | 2 | -2/+3 |
* | shell doc: remove stray "+" in example | Jonathan Nieder | 2014-05-08 | 1 | -1/+1 |
* | Start preparing for 1.9.3 | Junio C Hamano | 2014-05-08 | 2 | -1/+22 |
* | Merge branch 'cl/p4-use-diff-tree' into maint | Junio C Hamano | 2014-05-08 | 1 | -1/+1 |
|\ | |||||
| * | git-p4: format-patch to diff-tree change breaks binary patches | Tolga Ceylan | 2014-05-07 | 1 | -1/+1 |
* | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint | Junio C Hamano | 2014-05-08 | 2 | -24/+54 |
|\ \ | |||||
| * | | git-prompt.sh: don't put unsanitized branch names in $PS1 | Richard Hansen | 2014-04-22 | 2 | -24/+54 |
* | | | Merge branch 'km/avoid-non-function-return-in-rebase' into maint | Junio C Hamano | 2014-05-08 | 4 | -10/+46 |
|\ \ \ | |||||
| * | | | Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD" | Kyle J. McKay | 2014-04-17 | 1 | -10/+1 |
| * | | | rebase: avoid non-function use of "return" on FreeBSD | Kyle J. McKay | 2014-04-17 | 3 | -0/+45 |
* | | | | Merge branch 'tb/unicode-6.3-zero-width' into maint | Junio C Hamano | 2014-05-08 | 1 | -5/+4 |
|\ \ \ \ | |||||
| * | | | | utf8.c: partially update to version 6.3 | Torsten Bögershausen | 2014-04-09 | 1 | -5/+4 |
* | | | | | Merge branch 'km/avoid-bs-in-shell-glob' into maint | Junio C Hamano | 2014-05-08 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | test: fix t5560 on FreeBSD | Kyle J. McKay | 2014-04-11 | 1 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'km/avoid-cp-a' into maint | Junio C Hamano | 2014-05-08 | 1 | -2/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | test: fix t7001 cp to use POSIX options | Kyle J. McKay | 2014-04-11 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | 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 |
|\ \ \ \ | |||||
| * | | | | code and test: fix misuses of "nor" | Justin Lebar | 2014-04-01 | 12 | -16/+16 |
| * | | | | comments: fix misuses of "nor" | Justin Lebar | 2014-04-01 | 20 | -27/+26 |
| * | | | | contrib: fix misuses of "nor" | Justin Lebar | 2014-04-01 | 2 | -3/+3 |
| * | | | | Documentation: fix misuses of "nor" | Justin Lebar | 2014-04-01 | 25 | -44/+43 |
* | | | | | Merge branch 'cn/fetch-prune-overlapping-destination' into maint | Junio C Hamano | 2014-04-09 | 2 | -6/+64 |
|\ \ \ \ \ | |||||
| * | | | | | fetch: handle overlaping refspecs on --prune | Carlos Martín Nieto | 2014-03-26 | 2 | -7/+45 |
| * | | | | | fetch: add a failing test for prunning with overlapping refspecs | Carlos Martín Nieto | 2014-02-28 | 1 | -0/+20 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'mh/update-ref-batch-create-fix' into maint | Junio C Hamano | 2014-04-09 | 2 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | update-ref: fail create operation over stdin if ref already exists | Aman Gupta | 2014-04-02 | 2 | -0/+12 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jk/commit-dates-parsing-fix' into maint | Junio C Hamano | 2014-04-09 | 5 | -4/+47 |
|\ \ \ \ \ | |||||
| * | | | | | t4212: loosen far-in-future test for AIX | Jeff King | 2014-04-01 | 1 | -4/+2 |
| * | | | | | date: recognize bogus FreeBSD gmtime output | Jeff King | 2014-04-01 | 4 | -0/+45 |
* | | | | | | Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maint | Junio C Hamano | 2014-04-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff-no-index: correctly diagnose error return from diff_opt_parse() | Junio C Hamano | 2014-03-31 | 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 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | status: disable translation when --porcelain is used | Matthieu Moy | 2014-03-26 | 2 | -5/+9 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'bp/commit-p-editor' into maint | Junio C Hamano | 2014-04-08 | 10 | -39/+137 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | run-command: mark run_hook_with_custom_index as deprecated | Benoit Pierre | 2014-03-18 | 1 | -0/+1 |
| * | | | | | | | merge hook tests: fix and update tests | Benoit Pierre | 2014-03-18 | 1 | -6/+21 |
| * | | | | | | | merge: fix GIT_EDITOR override for commit hook | Benoit Pierre | 2014-03-18 | 1 | -1/+1 |
| * | | | | | | | commit: fix patch hunk editing with "commit -p -m" | Benoit Pierre | 2014-03-18 | 9 | -32/+80 |
| * | | | | | | | test patch hunk editing with "commit -p -m" | Benoit Pierre | 2014-03-18 | 1 | -0/+34 |
| * | | | | | | | merge hook tests: use 'test_must_fail' instead of '!' | Benoit Pierre | 2014-03-11 | 1 | -2/+2 |
| * | | | | | | | merge hook tests: fix missing '&&' in test | Benoit Pierre | 2014-03-11 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Start preparing for 1.9.1 | Junio C Hamano | 2014-04-03 | 2 | -1/+39 |
* | | | | | | | Merge branch 'jk/mv-submodules-fix' into maint | Junio C Hamano | 2014-04-03 | 2 | -1/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mv: prevent mismatched data when ignoring errors. | brian m. carlson | 2014-03-17 | 2 | -1/+17 |