summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | gitk: Add Ctrl-W shortcut for closing the active windowJens Lehmann2010-03-201-0/+3
* | | | | | | | | | rebase-interactive: silence warning when no commits rewrittenJeff King2010-04-181-0/+1
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-04-174-13/+23
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | t1010-mktree: Adjust expected result to code and documentationMichael J Gruber2010-04-171-6/+4
| * | | | | | | | | combined diff: correctly handle truncated fileThomas Rast2010-04-172-6/+16
| * | | | | | | | | Document new "already-merged" rule for branch -dJonathan Nieder2010-04-151-1/+3
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | t6006: do not write to /tmpMatthew Ogilvie2010-04-171-1/+1
* | | | | | | | | git-instaweb: pass through invoking user's path to gitweb CGI scriptsChris Webb2010-04-171-2/+2
* | | | | | | | | gitweb: simplify gitweb.min.* generation and clean-up rulesJunio C Hamano2010-04-171-37/+38
* | | | | | | | | tag -v: use RUN_GIT_CMD to run verify-tagJonathan Nieder2010-04-171-2/+2
* | | | | | | | | Add .depend directories to .gitignoreJonathan Nieder2010-04-151-1/+1
* | | | | | | | | Merge branch 'maint'Junio C Hamano2010-04-133-7/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Documentation/config.txt: default gc.aggressiveWindow is 250, not 10Jay Soffian2010-04-131-1/+1
| * | | | | | | | Docs: Add -X option to git-merge's synopsis.Marc Branchaud2010-04-122-6/+7
* | | | | | | | | Merge branch 'jl/maint-submodule-gitfile-awareness'Junio C Hamano2010-04-113-7/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Windows: start_command: Support non-NULL dir in struct child_processJohannes Sixt2010-04-113-7/+8
* | | | | | | | | | Sync with 1.7.0.5Junio C Hamano2010-04-114-11/+39
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Git 1.7.0.5v1.7.0.5Junio C Hamano2010-04-114-3/+30
| * | | | | | | | | Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maintJunio C Hamano2010-04-111-1/+1
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | blame documentation: -M/-C notice copied lines as well as moved onesJunio C Hamano2010-04-111-9/+10
* | | | | | | | | | | Merge branch 'jc/doc-submit-gmail'Junio C Hamano2010-04-111-11/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SubmittingPatches: update GMail sectionJunio C Hamano2010-04-071-11/+24
* | | | | | | | | | | | t3507: Make test executableStephen Boyd2010-04-111-0/+0
| |_|_|_|_|/ / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Git 1.7.1-rc1v1.7.1-rc1Junio C Hamano2010-04-101-1/+4
* | | | | | | | | | | Merge branch 'mr/gitweb-jsmin'Junio C Hamano2010-04-107-36/+83
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitweb: update INSTALL to use shorter make targetMark Rada2010-04-021-9/+7
| * | | | | | | | | | | gitweb: add documentation to INSTALL regarding gitweb.jsMark Rada2010-04-021-10/+13
| * | | | | | | | | | | instaweb: add minification awarenessMark Rada2010-04-022-4/+14
| * | | | | | | | | | | Gitweb: add autoconfigure support for minifiersMark Rada2010-04-023-16/+22
| * | | | | | | | | | | Gitweb: add support for minifying gitweb.cssMark Rada2010-04-024-14/+43
| * | | | | | | | | | | Gitweb: add ignore and clean rules for minified filesMark Rada2010-04-022-1/+2
* | | | | | | | | | | | Merge branch 'jl/maint-submodule-gitfile-awareness'Junio C Hamano2010-04-103-17/+47
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Teach diff --submodule and status to handle .git files in submodulesJens Lehmann2010-04-103-17/+47
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-04-095-14/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Let check_preimage() use memset() to initialize "struct checkout"Jens Lehmann2010-04-091-4/+1
| * | | | | | | | | | | Merge branch 'ef/maint-empty-commit-log' into maintJunio C Hamano2010-04-092-1/+13
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/conflict-marker-size' into maintJunio C Hamano2010-04-092-14/+33
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into maintJunio C Hamano2010-04-091-7/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/maint-send-email-lazy-editor' into maintJunio C Hamano2010-04-091-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/imap-send-unconfuse-from-line' into maintJunio C Hamano2010-04-092-8/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rb/maint-python-path' into maintJunio C Hamano2010-04-095-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gh/maint-stash-show-error-message' into maintJunio C Hamano2010-04-091-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/mailmap-update' into maintJunio C Hamano2010-04-091-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/maint-daemon-sans-ss-family' into maintJunio C Hamano2010-04-091-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | fetch/push: fix usage stringsTay Ray Chuan2010-04-094-10/+10
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rc/maint-reflog-msg-for-forced-branch'Junio C Hamano2010-04-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | branch: say "Reset to" in reflog entries for 'git branch -f' operationsTay Ray Chuan2010-04-091-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge early parts of jk/cached-textconvJunio C Hamano2010-04-083-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | diff.c: work around pointer constness warningsJunio C Hamano2010-04-081-2/+2
| * | | | | | | | | | | | | | | | | | | | | fix textconv leak in emit_rewrite_diffJeff King2010-04-011-0/+4