summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'mh/status-optionally-refresh'Junio C Hamano2010-05-082-0/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t7508: add a test for "git status" in a read-only repositoryMarkus Heidelberg2010-04-031-0/+15
| * | | | | | | | | | git status: refresh the index if possibleMarkus Heidelberg2010-04-022-1/+10
| * | | | | | | | | | t7508: add test for "git status" refreshing the indexMarkus Heidelberg2010-04-021-0/+10
* | | | | | | | | | | Merge branch 'cw/ws-indent-with-tab'Junio C Hamano2010-05-086-85/+162
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | whitespace: tests for git-apply --whitespace=fix with tab-in-indentChris Webb2010-04-041-24/+29
| * | | | | | | | | | | whitespace: add tab-in-indent support for --whitespace=fixChris Webb2010-04-041-0/+14
| * | | | | | | | | | | whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dstChris Webb2010-04-043-54/+48
| * | | | | | | | | | | whitespace: tests for git-diff --check with tab-in-indent error classChris Webb2010-04-041-0/+42
| * | | | | | | | | | | whitespace: add tab-in-indent error classChris Webb2010-04-023-5/+25
| * | | | | | | | | | | whitespace: we cannot "catch all errors known to git" anymoreJunio C Hamano2010-04-021-2/+4
* | | | | | | | | | | | Merge branch 'cc/revert-strategy'Junio C Hamano2010-05-083-110/+153
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | revert: add "--strategy" option to choose merge strategyChristian Couder2010-04-011-2/+23
| * | | | | | | | | | | | merge: make function try_merge_command non staticChristian Couder2010-04-012-2/+5
| * | | | | | | | | | | | merge: refactor code that calls "git merge-STRATEGY"Christian Couder2010-04-011-36/+45
| * | | | | | | | | | | | revert: refactor merge recursive code into its own functionChristian Couder2010-04-011-48/+58
| * | | | | | | | | | | | revert: use strbuf to refactor the code that writes the merge messageChristian Couder2010-04-011-36/+34
* | | | | | | | | | | | | Merge branch 'sc/http-late-auth'Junio C Hamano2010-05-083-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Prompt for a username when an HTTP request 401sScott Chacon2010-04-013-2/+24
* | | | | | | | | | | | | | Merge branch 'jk/cached-textconv'Junio C Hamano2010-05-0814-118/+403
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | diff: avoid useless filespec populationJeff King2010-04-021-5/+4
| * | | | | | | | | | | | | | diff: cache textconv outputJeff King2010-04-025-9/+185
| * | | | | | | | | | | | | | textconv: refactor calls to run_textconvJeff King2010-04-021-36/+30
| * | | | | | | | | | | | | | introduce notes-cache interfaceJeff King2010-04-013-0/+116
| * | | | | | | | | | | | | | make commit_tree a library functionJeff King2010-04-016-72/+72
* | | | | | | | | | | | | | | Merge branch 'pc/remove-warn'Junio C Hamano2010-05-086-21/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove a redundant errno test in a usage of remove_pathPeter Collingbourne2010-03-281-1/+1
| * | | | | | | | | | | | | | Introduce remove_or_warn functionPeter Collingbourne2010-03-285-15/+51
| * | | | | | | | | | | | | | Implement the rmdir_or_warn functionPeter Collingbourne2010-03-282-0/+9
| * | | | | | | | | | | | | | Generalise the unlink_or_warn functionPeter Collingbourne2010-03-281-5/+7
* | | | | | | | | | | | | | | cherry-pick: do not dump core when iconv failsJonathan Nieder2010-05-081-2/+7
* | | | | | | | | | | | | | | Makefile: Fix 'clean' target to remove all gitweb build filesRamsay Jones2010-05-081-1/+1
* | | | | | | | | | | | | | | Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRefLeif Arne Storset2010-05-071-4/+4
* | | | | | | | | | | | | | | test-lib: some shells do not let $? propagate into an evalJonathan Nieder2010-05-062-3/+25
* | | | | | | | | | | | | | | test-lib: Let tests specify commands to be run at end of testJonathan Nieder2010-05-041-1/+27
* | | | | | | | | | | | | | | Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-044-19/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-044-19/+13
* | | | | | | | | | | | | | | | Documentation/git-send-email: Add "Use gmail as the smtp server"Ping Yin2010-05-041-0/+15
* | | | | | | | | | | | | | | | clone: quell the progress report from init and report on cloneJunio C Hamano2010-05-042-2/+6
* | | | | | | | | | | | | | | | test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.Michal Sojka2010-05-041-0/+12
* | | | | | | | | | | | | | | | Gitweb: ignore built fileSverre Rabbelier2010-05-021-0/+1
* | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-05-012-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | index-pack: fix trivial typo in usage stringMichael J Gruber2010-05-011-1/+1
| * | | | | | | | | | | | | | | git-submodule.sh: properly initialize shell variablesGerrit Pape2010-05-011-0/+2
* | | | | | | | | | | | | | | | xdiff/xmerge.c: use memset() instead of explicit for-loopAlexey Mahotkin2010-05-011-9/+8
* | | | | | | | | | | | | | | | Git 1.7.1v1.7.1Junio C Hamano2010-04-233-9/+8
* | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-04-231-9/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Documentation improvements for the description of short format.Eric Raymond2010-04-231-9/+34
* | | | | | | | | | | | | | | | Sync with 1.7.0.6Junio C Hamano2010-04-222-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Git 1.7.0.6v1.7.0.6Junio C Hamano2010-04-224-3/+17
View Lorry Controller Status