summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* commit: Add -f, --fixes <commit> option to add Fixes: linejt/commit-fixes-footerJosh Triplett2013-10-305-13/+98
* Almost -rc0 for 1.8.5Junio C Hamano2013-10-281-0/+15
* Sync with v1.8.4.2Junio C Hamano2013-10-284-3/+18
|\
| * Git 1.8.4.2v1.8.4.2Junio C Hamano2013-10-283-2/+17
| * Merge branch 'jk/clone-progress-to-stderr' into maintJunio C Hamano2013-10-284-28/+32
| |\
| * \ Merge branch 'jk/format-patch-from' into maintJunio C Hamano2013-10-284-1/+49
| |\ \
| * \ \ Merge branch 'jk/shortlog-tolerate-broken-commit' into maintJunio C Hamano2013-10-282-2/+20
| |\ \ \
| * \ \ \ Merge branch 'jk/diff-algo' into maintJunio C Hamano2013-10-281-2/+2
| |\ \ \ \
| * | | | | test-lib: fix typo in commentTorstein Hegge2013-10-281-1/+1
| * | | | | sha1_file: move comment about return value where it belongsChristian Couder2013-10-281-1/+1
* | | | | | Merge branch 'sb/repack-in-c'Junio C Hamano2013-10-281-1/+1
|\ \ \ \ \ \
| * | | | | | Reword repack documentation to no longer state it's a scriptStefan Beller2013-10-221-1/+1
* | | | | | | Merge branch 'sg/prompt-svn-remote-fix'Junio C Hamano2013-10-281-1/+1
|\ \ \ \ \ \ \
| * | | | | | | bash prompt: don't use '+=' operator in show upstream code pathsg/prompt-svn-remote-fixSZEDER Gábor2013-10-151-1/+1
* | | | | | | | Merge branch 'jk/split-broken-ident'Junio C Hamano2013-10-282-3/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | split_ident: parse timestamp from end of linejk/split-broken-identJeff King2013-10-152-3/+22
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/remote-literal-string-leakfix'Junio C Hamano2013-10-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | remote: do not copy "origin" string literaljk/remote-literal-string-leakfixJeff King2013-10-151-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'ew/keepalive'Junio C Hamano2013-10-281-0/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | http: use curl's tcp keepalive if availableew/keepaliveJeff King2013-10-161-4/+20
| * | | | | | | | http: enable keepalive on TCP socketsEric Wong2013-10-141-0/+22
* | | | | | | | | Merge branch 'jc/revision-range-unpeel'Junio C Hamano2013-10-282-22/+45
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | revision: do not peel tags used in range notationJunio C Hamano2013-10-152-22/+45
* | | | | | | | | | Merge branch 'jx/relative-path-regression-fix'Junio C Hamano2013-10-284-32/+99
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use simpler relative_path when set_git_dirjx/relative-path-regression-fixJiang Xin2013-10-143-4/+47
| * | | | | | | | | | relative_path should honor dos-drive-prefixJiang Xin2013-10-142-0/+24
| * | | | | | | | | | test: use unambigous leading path (/foo) for MSYSJiang Xin2013-10-141-28/+28
* | | | | | | | | | | Update draft release notes to 1.8.5Junio C Hamano2013-10-231-0/+4
* | | | | | | | | | | Sync with 'maint'Junio C Hamano2013-10-231-0/+13
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Almost 1.8.4.2 ;-)Junio C Hamano2013-10-231-0/+13
| * | | | | | | | | | Merge branch 'jc/ls-files-killed-optim' into maintJunio C Hamano2013-10-234-17/+67
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-10-234-8/+45
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/fetch-into-shallow' into maintJunio C Hamano2013-10-2312-160/+152
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/gnome-keyring'Junio C Hamano2013-10-232-134/+167
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyringbc/gnome-keyringBrandon Casey2013-10-161-0/+39
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: support ancient gnome-keyringBrandon Casey2013-10-161-0/+58
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: report failure to store passwordBrandon Casey2013-10-161-1/+9
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: use glib messaging functionsBrandon Casey2013-10-161-29/+4
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: use glib memory allocation functionsBrandon Casey2013-10-161-32/+16
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: use secure memory for reading passwordsBrandon Casey2013-10-161-3/+9
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: use secure memory functions for passwdsBrandon Casey2013-10-161-15/+6
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object()Brandon Casey2013-10-161-11/+3
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: set Gnome application nameBrandon Casey2013-10-162-2/+5
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before acc...Brandon Casey2013-10-161-1/+1
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_tBrandon Casey2013-10-161-1/+1
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectlyBrandon Casey2013-10-161-1/+1
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: add static where applicableBrandon Casey2013-10-161-9/+9
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: *style* use "if ()" not "if()" etc.Brandon Casey2013-10-161-10/+10
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: remove unused die() functionBrandon Casey2013-09-231-10/+0
| * | | | | | | | | | | | | | contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarationsBrandon Casey2013-09-231-13/+0