summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fetch: improve the error messages emitted for conflicting refspecsmh/fetch-tags-in-addition-to-normal-refsMichael Haggerty2013-10-302-8/+31
* handle_duplicate(): mark error message for translationMichael Haggerty2013-10-301-1/+1
* ref_remote_duplicates(): extract a function handle_duplicate()Michael Haggerty2013-10-301-8/+10
* ref_remove_duplicates(): simplify loop logicMichael Haggerty2013-10-303-26/+38
* t5536: new test of refspec conflicts when fetchingMichael Haggerty2013-10-301-0/+96
* ref_remove_duplicates(): avoid redundant bisectionMichael Haggerty2013-10-301-6/+6
* git-fetch.txt: improve description of tag auto-followingMichael Haggerty2013-10-301-7/+7
* fetch-options.txt: simplify ifdef/ifndef/endif usageMichael Haggerty2013-10-301-4/+1
* fetch, remote: properly convey --no-prune options to subprocessesMichael Haggerty2013-10-302-5/+5
* builtin/remote.c:update(): use struct argv_arrayMichael Haggerty2013-10-301-16/+17
* builtin/remote.c: reorder function definitionsMichael Haggerty2013-10-301-81/+78
* query_refspecs(): move some constants out of the loopMichael Haggerty2013-10-301-2/+2
* fetch --prune: prune only based on explicit refspecsMichael Haggerty2013-10-304-42/+30
* fetch --tags: fetch tags *in addition to* other stuffMichael Haggerty2013-10-307-38/+78
* fetch: only opportunistically update references based on command lineMichael Haggerty2013-10-301-12/+32
* get_expanded_map(): avoid memory leakMichael Haggerty2013-10-301-3/+3
* get_expanded_map(): add docstringMichael Haggerty2013-10-301-0/+7
* builtin/fetch.c: reorder function definitionsMichael Haggerty2013-10-301-101/+97
* get_ref_map(): rename local variablesMichael Haggerty2013-10-241-6/+6
* api-remote.txt: correct section "struct refspec"Michael Haggerty2013-10-241-10/+10
* t5510: check that "git fetch --prune --tags" does not prune branchesMichael Haggerty2013-10-241-0/+4
* t5510: prepare test refs more straightforwardlyMichael Haggerty2013-10-241-4/+4
* t5510: use the correct tag name in testMichael Haggerty2013-10-241-1/+1
* 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
* | | | | | Merge branch 'po/dot-url'Junio C Hamano2013-10-232-2/+8
|\ \ \ \ \ \
| * | | | | | doc/cli: make "dot repository" an independent bullet pointpo/dot-urlPhilip Oakley2013-10-151-4/+4
| * | | | | | config doc: update dot-repository notesPhilip Oakley2013-09-131-2/+4
| * | | | | | doc: command line interface (cli) dot-repository dwimmeryPhilip Oakley2013-09-131-0/+4