summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'am/stash-branch'Junio C Hamano2008-07-133-1/+99
|\
| * Add a test for "git stash branch"Abhijit Menon-Sen2008-07-061-0/+60
| * Implement "git stash branch <newbranch> <stash>"Abhijit Menon-Sen2008-07-052-1/+39
* | Merge branch 'sg/stash-k-i'Junio C Hamano2008-07-133-6/+52
|\ \
| * | Documentation: tweak use case in "git stash save --keep-index"Eric Raible2008-07-081-7/+8
| * | stash: introduce 'stash save --keep-index' optionSZEDER Gábor2008-07-053-6/+51
| |/
* | Merge branch 'jc/report-tracking'Junio C Hamano2008-07-137-90/+244
|\ \
| * | branch -r -v: do not spit out garbageJunio C Hamano2008-07-061-3/+2
| * | stat_tracking_info(): clear object flags used during countingJunio C Hamano2008-07-033-0/+75
| * | git-branch -v: show the remote tracking statisticsJunio C Hamano2008-07-021-2/+25
| * | git-status: show the remote tracking statisticsJunio C Hamano2008-07-021-0/+22
| * | Refactor "tracking statistics" code used by "git checkout"Junio C Hamano2008-07-023-88/+123
* | | Merge branch 'js/pick-root'Junio C Hamano2008-07-132-10/+46
|\ \ \
| * | | Allow cherry-picking root commitsJohannes Schindelin2008-07-072-10/+46
* | | | Merge branch 'ab/bundle'Junio C Hamano2008-07-131-2/+11
|\ \ \ \
| * | | | Teach git-bundle to read revision arguments from stdin like git-rev-list.Adam Brewster2008-07-071-2/+11
| |/ / /
* | | | Merge branch 'tr/add-i-e'Junio C Hamano2008-07-133-100/+174
|\ \ \ \
| * | | | git-add--interactive: manual hunk editing modeThomas Rast2008-07-023-0/+187
| * | | | git-add--interactive: remove hunk coalescingThomas Rast2008-07-021-89/+0
| * | | | git-add--interactive: replace hunk recounting with apply --recountThomas Rast2008-07-021-27/+3
* | | | | apply: fix copy/rename breakageJunio C Hamano2008-07-092-3/+27
* | | | | Merge branch 'jk/pager-config'Junio C Hamano2008-07-091-4/+47
|\ \ \ \ \
| * | | | | Allow per-command pager configJeff King2008-07-061-4/+47
* | | | | | Merge branch 'js/apply-root'Junio C Hamano2008-07-093-1/+76
|\ \ \ \ \ \
| * | | | | | git-apply --directory: make --root more similar to GNU diffJunio C Hamano2008-07-063-8/+12
| * | | | | | apply --root: thinkofix.Junio C Hamano2008-07-022-4/+15
| * | | | | | Teach "git apply" to prepend a prefix with "--root=<root>"Johannes Schindelin2008-07-013-1/+61
* | | | | | | Merge branch 'jc/reflog-expire'Junio C Hamano2008-07-091-19/+137
|\ \ \ \ \ \ \
| * | | | | | | Make default expiration period of reflog used for stash infiniteJunio C Hamano2008-06-281-0/+11
| * | | | | | | Per-ref reflog expiry configurationJunio C Hamano2008-06-281-19/+126
* | | | | | | | git-send-email: Fix authenticating on some servers when using TLS.Robert Shearman2008-07-091-0/+3
* | | | | | | | Provide fallback definitions of PRIu32 and PRIx32Johannes Sixt2008-07-091-0/+8
* | | | | | | | t9100-git-svn-basic.sh: Fix determination of utf-8 localeRamsay Jones2008-07-091-4/+4
* | | | | | | | t9113-*.sh: provide user feedback when test skippedRamsay Jones2008-07-091-1/+7
* | | | | | | | Merge branch 'sp/maint-pack-memuse'Junio C Hamano2008-07-091-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Correct pack memory leak causing git gc to try to exceed ulimitShawn O. Pearce2008-07-091-0/+1
* | | | | | | | | Merge branch 'maint'Junio C Hamano2008-07-098-8/+106
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Start preparing release notes for 1.5.6.3Junio C Hamano2008-07-082-1/+43
| * | | | | | | | git-submodule - Fix bugs in adding an existing repo as a moduleMark Levedahl2008-07-081-2/+1
| * | | | | | | | bash: offer only paths after '--'SZEDER Gábor2008-07-081-0/+30
| * | | | | | | | Remove unnecessary pack-*.keep file after successful git-cloneShawn O. Pearce2008-07-082-3/+24
| * | | | | | | | make deleting a missing ref more quietJeff King2008-07-083-3/+9
| * | | | | | | | Merge branch 'qq/maint' into maintJunio C Hamano2008-07-081-0/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'lt/racy-empty' into maintJunio C Hamano2008-07-081-0/+16
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | Documentation: update sections on naming revisions and revision rangesJunio C Hamano2008-07-081-5/+15
* | | | | | | | | | | Tone down warning about GNU Interactive ToolsJunio C Hamano2008-07-081-11/+9
* | | | | | | | | | | Avoid apache complaining about lack of server's FQDNMike Hommey2008-07-081-0/+1
* | | | | | | | | | | Skip t5540-http-push test when USE_CURL_MULTI is undefinedMike Hommey2008-07-081-0/+7
* | | | | | | | | | | Fix http-push testMike Hommey2008-07-082-9/+11
* | | | | | | | | | | Catch failures from t5540-http-pushMike Hommey2008-07-081-3/+4