summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | git p4: Use git diff-tree instead of format-patchCrestez Dan Leonard2013-11-221-1/+1
* | | | | | | | | | | | | Merge branch 'tr/config-multivalue-lift-max'Junio C Hamano2013-12-122-6/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | config: arbitrary number of matches for --unset and --replace-alltr/config-multivalue-lift-maxThomas Rast2013-12-062-6/+77
* | | | | | | | | | | | | | Merge branch 'mh/fetch-tags-in-addition-to-normal-refs'Junio C Hamano2013-12-1214-320/+503
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Merge git://repo.or.cz/git-guiJunio C Hamano2013-12-098-17/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-gui: correct spelling errors in commentsMasanari Iida2013-11-154-5/+5
| * | | | | | | | | | | | | | | git-gui: add menu item to launch a bash shell on Windows.Pat Thoyts2013-09-121-0/+10
| * | | | | | | | | | | | | | | git-gui: corrected setup of git worktree under cygwin.John Murphy2013-09-061-1/+5
| * | | | | | | | | | | | | | | git-gui: right half window is panedMax Kirillov2013-08-271-5/+11
| * | | | | | | | | | | | | | | git-gui: Add gui.displayuntracked optionMax Kirillov2013-08-272-4/+11
| * | | | | | | | | | | | | | | git-gui: show the maxrecentrepo config option in the preferences dialogPat Thoyts2013-08-272-0/+2
| * | | | | | | | | | | | | | | git-gui: added gui.maxrecentrepo to extend the number of remembered reposPat Thoyts2013-08-271-2/+10
| * | | | | | | | | | | | | | | git-gui: Improve font rendering on retina macbooksMads Dørup2013-08-271-0/+2
* | | | | | | | | | | | | | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2013-12-091-210/+353
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | gitk: Recognize -L optionThomas Rast2013-12-021-0/+8
| * | | | | | | | | | | | | | | gitk: Support showing the gathered inline diffsThomas Rast2013-12-021-0/+38
| * | | | | | | | | | | | | | | gitk: Split out diff part in $commitinfoThomas Rast2013-12-021-1/+10
| * | | | | | | | | | | | | | | gitk: Refactor per-line part of getblobdiffline and its supportThomas Rast2013-12-021-195/+213
| * | | | | | | | | | | | | | | gitk: Support -G option from the command lineThomas Rast2013-12-021-1/+1
| * | | | | | | | | | | | | | | gitk: Tag display improvementsPaul Mackerras2013-10-311-13/+83
* | | | | | | | | | | | | | | | Start 1.9 cycleJunio C Hamano2013-12-063-2/+135
* | | | | | | | | | | | | | | | Merge branch 'jk/remove-experimental-loose-object-support'Junio C Hamano2013-12-0619-143/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | drop support for "experimental" loose objectsjk/remove-experimental-loose-object-supportJeff King2013-11-2119-143/+0
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'nd/magic-pathspec'Junio C Hamano2013-12-062-10/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | diff: restrict pathspec limitations to diff b/f case onlynd/magic-pathspecNguyễn Thái Ngọc Duy2013-11-202-10/+13
* | | | | | | | | | | | | | | | | Merge branch 'rr/for-each-ref-decoration'Junio C Hamano2013-12-063-27/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | for-each-ref: avoid color leakagerr/for-each-ref-decorationRamkumar Ramachandra2013-11-192-6/+24