Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 1.7.7-rc0v1.7.7-rc0 | Junio C Hamano | 2011-08-25 | 2 | -3/+10 |
* | Merge branch 'jc/merge-reword' | Junio C Hamano | 2011-08-25 | 2 | -4/+4 |
|\ | |||||
| * | merge: reword the final message | Junio C Hamano | 2011-05-25 | 2 | -4/+4 |
* | | Merge branch 'mg/branch-set-upstream-previous' | Junio C Hamano | 2011-08-25 | 2 | -1/+15 |
|\ \ | |||||
| * | | branch.c: use the parsed branch name | Michael J Gruber | 2011-08-19 | 2 | -1/+15 |
* | | | Merge branch 'da/difftool-mergtool-refactor' | Junio C Hamano | 2011-08-25 | 18 | -320/+432 |
|\ \ \ | |||||
| * | | | mergetools/meld: Use '--output' when available | David Aguilar | 2011-08-19 | 1 | -1/+24 |
| * | | | mergetool--lib: Refactor tools into separate files | David Aguilar | 2011-08-19 | 17 | -333/+369 |
| * | | | mergetool--lib: Make style consistent with git | David Aguilar | 2011-08-19 | 1 | -53/+100 |
| * | | | difftool--helper: Make style consistent with git | David Aguilar | 2011-08-19 | 1 | -6/+12 |
* | | | | Merge branch 'jc/maint-autofix-tag-in-head' | Junio C Hamano | 2011-08-25 | 1 | -42/+45 |
|\ \ \ \ | |||||
| * | | | | commit: reduce use of redundant global variables | Junio C Hamano | 2011-08-19 | 1 | -42/+45 |
* | | | | | Merge branch 'di/fast-import-doc' | Junio C Hamano | 2011-08-25 | 2 | -3/+54 |
|\ \ \ \ \ | |||||
| * | | | | | doc/fast-import: document feature import-marks-if-exists | Dmitry Ivankov | 2011-08-17 | 2 | -3/+54 |
* | | | | | | Merge branch 'jn/plug-empty-tree-leak' | Junio C Hamano | 2011-08-25 | 3 | -12/+30 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge-recursive: take advantage of hardcoded empty tree | Jonathan Nieder | 2011-08-16 | 1 | -5/+3 |
| * | | | | | | revert: plug memory leak in "cherry-pick root commit" codepath | Jonathan Nieder | 2011-08-16 | 2 | -7/+27 |
* | | | | | | | Merge branch 'ac/describe-dirty-refresh' | Junio C Hamano | 2011-08-25 | 1 | -2/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | describe: Refresh the index when run with --dirty | Allan Caffee | 2011-08-11 | 1 | -2/+15 |
* | | | | | | | | Merge branch 'di/parse-options-split' | Junio C Hamano | 2011-08-25 | 6 | -152/+159 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Reduce parse-options.o dependencies | Dmitry Ivankov | 2011-08-11 | 5 | -150/+155 |
| * | | | | | | | | parse-options: export opterr, optbug | Dmitry Ivankov | 2011-08-11 | 2 | -2/+4 |
* | | | | | | | | | Merge branch 'js/i18n-scripts' | Junio C Hamano | 2011-08-25 | 5 | -40/+44 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | submodule: take advantage of gettextln and eval_gettextln. | Jon Seymour | 2011-08-08 | 1 | -12/+6 |
| * | | | | | | | | | stash: take advantage of eval_gettextln | Jon Seymour | 2011-08-08 | 1 | -6/+3 |
| * | | | | | | | | | pull: take advantage of eval_gettextln | Jon Seymour | 2011-08-08 | 1 | -5/+2 |
| * | | | | | | | | | git-am: take advantage of gettextln and eval_gettextln. | Jon Seymour | 2011-08-08 | 1 | -17/+14 |
| * | | | | | | | | | gettext: add gettextln, eval_gettextln to encode common idiom | Jon Seymour | 2011-08-08 | 1 | -0/+19 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-08-25 | 5 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | whitespace: have SP on both sides of an assignment "=" | Junio C Hamano | 2011-08-25 | 4 | -4/+4 |
| * | | | | | | | | | | update-ref: whitespace fix | Pang Yan Han | 2011-08-25 | 1 | -1/+1 |
* | | | | | | | | | | | Sync with 1.7.6.1 | Junio C Hamano | 2011-08-24 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Git 1.7.6.1v1.7.6.1 | Junio C Hamano | 2011-08-24 | 2 | -2/+3 |
| * | | | | | | | | | | Merge branch 'jc/maint-smart-http-race-upload-pack' into maint | Junio C Hamano | 2011-08-24 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | get_indexed_object can return NULL if nothing is in that slot; check for it | Brian Harring | 2011-08-24 | 1 | -0/+2 |
* | | | | | | | | | | | | Update draft release notes to 1.7.7 | Junio C Hamano | 2011-08-23 | 1 | -15/+9 |
* | | | | | | | | | | | | Merge branch 'rt/zlib-smaller-window' | Junio C Hamano | 2011-08-23 | 23 | -13/+99 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | test: consolidate definition of $LF | Junio C Hamano | 2011-08-11 | 5 | -9/+4 |
| * | | | | | | | | | | | | Tolerate zlib deflation with window size < 32Kb | Roberto Tyley | 2011-08-11 | 19 | -6/+97 |
* | | | | | | | | | | | | | Merge branch 'jn/maint-test-return' | Junio C Hamano | 2011-08-23 | 2 | -9/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t3900: do not reference numbered arguments from the test script | Johannes Sixt | 2011-08-11 | 1 | -2/+2 |
| * | | | | | | | | | | | | | test: cope better with use of return for errors | Jonathan Nieder | 2011-08-08 | 1 | -2/+8 |
| * | | | | | | | | | | | | | test: simplify return value of test_run_ | Jonathan Nieder | 2011-08-08 | 1 | -5/+3 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'cb/maint-ls-files-error-report' | Junio C Hamano | 2011-08-23 | 6 | -10/+88 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | ls-files: fix pathspec display on error | Clemens Buchacher | 2011-08-11 | 6 | -10/+88 |
* | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-08-23 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Update draft release notes for 1.7.6.1 | Junio C Hamano | 2011-08-23 | 1 | -0/+11 |
| * | | | | | | | | | | | | | Merge branch 'jc/maint-combined-diff-work-tree' into maint | Junio C Hamano | 2011-08-23 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-exec-error-report' into maint | Junio C Hamano | 2011-08-23 | 3 | -17/+33 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cb/maint-quiet-push' into maint | Junio C Hamano | 2011-08-23 | 6 | -10/+39 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |