aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'cw/ws-indent-with-tab'Junio C Hamano2010-05-08
|\
| * whitespace: tests for git-apply --whitespace=fix with tab-in-indentChris Webb2010-04-04
| * whitespace: add tab-in-indent support for --whitespace=fixChris Webb2010-04-04
| * whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dstChris Webb2010-04-04
| * whitespace: tests for git-diff --check with tab-in-indent error classChris Webb2010-04-04
| * whitespace: add tab-in-indent error classChris Webb2010-04-02
| * whitespace: we cannot "catch all errors known to git" anymoreJunio C Hamano2010-04-02
* | Merge branch 'cc/revert-strategy'Junio C Hamano2010-05-08
|\ \
| * | revert: add "--strategy" option to choose merge strategyChristian Couder2010-04-01
| * | merge: make function try_merge_command non staticChristian Couder2010-04-01
| * | merge: refactor code that calls "git merge-STRATEGY"Christian Couder2010-04-01
| * | revert: refactor merge recursive code into its own functionChristian Couder2010-04-01
| * | revert: use strbuf to refactor the code that writes the merge messageChristian Couder2010-04-01
* | | Merge branch 'sc/http-late-auth'Junio C Hamano2010-05-08
|\ \ \
| * | | Prompt for a username when an HTTP request 401sScott Chacon2010-04-01
* | | | Merge branch 'jk/cached-textconv'Junio C Hamano2010-05-08
|\ \ \ \
| * | | | diff: avoid useless filespec populationJeff King2010-04-02
| * | | | diff: cache textconv outputJeff King2010-04-02
| * | | | textconv: refactor calls to run_textconvJeff King2010-04-02
| * | | | introduce notes-cache interfaceJeff King2010-04-01
| * | | | make commit_tree a library functionJeff King2010-04-01
* | | | | Merge branch 'pc/remove-warn'Junio C Hamano2010-05-08
|\ \ \ \ \
| * | | | | Remove a redundant errno test in a usage of remove_pathPeter Collingbourne2010-03-28
| * | | | | Introduce remove_or_warn functionPeter Collingbourne2010-03-28
| * | | | | Implement the rmdir_or_warn functionPeter Collingbourne2010-03-28
| * | | | | Generalise the unlink_or_warn functionPeter Collingbourne2010-03-28
* | | | | | cherry-pick: do not dump core when iconv failsJonathan Nieder2010-05-08
* | | | | | Makefile: Fix 'clean' target to remove all gitweb build filesRamsay Jones2010-05-08
* | | | | | Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRefLeif Arne Storset2010-05-07
* | | | | | test-lib: some shells do not let $? propagate into an evalJonathan Nieder2010-05-06
* | | | | | test-lib: Let tests specify commands to be run at end of testJonathan Nieder2010-05-04
* | | | | | Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-04
|\ \ \ \ \ \
| * | | | | | remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-04
* | | | | | | Documentation/git-send-email: Add "Use gmail as the smtp server"Ping Yin2010-05-04
* | | | | | | clone: quell the progress report from init and report on cloneJunio C Hamano2010-05-04
* | | | | | | test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.Michal Sojka2010-05-04
* | | | | | | Gitweb: ignore built fileSverre Rabbelier2010-05-02
* | | | | | | Merge branch 'maint'Junio C Hamano2010-05-01
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | index-pack: fix trivial typo in usage stringMichael J Gruber2010-05-01
| * | | | | | git-submodule.sh: properly initialize shell variablesGerrit Pape2010-05-01
* | | | | | | xdiff/xmerge.c: use memset() instead of explicit for-loopAlexey Mahotkin2010-05-01
* | | | | | | Git 1.7.1v1.7.1Junio C Hamano2010-04-23
* | | | | | | Merge branch 'maint'Junio C Hamano2010-04-23
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Documentation improvements for the description of short format.Eric Raymond2010-04-23
* | | | | | | Sync with 1.7.0.6Junio C Hamano2010-04-22
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Git 1.7.0.6v1.7.0.6Junio C Hamano2010-04-22
| * | | | | | Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maintJunio C Hamano2010-04-22
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'wp/doc-filter-direction' into maintJunio C Hamano2010-04-22
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-diffstat-overflow' into maintJunio C Hamano2010-04-22
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'da/maint-python-startup' into maintJunio C Hamano2010-04-22
| |\ \ \ \ \ \ \ \ \