aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-01-18
|\
| * Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano2010-01-18
| |\
| | * Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2010-01-18
| | |\
| | | * Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2010-01-10
| | | |\
| | | | * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2010-01-10
| | | | |\
| | | | | * base85: Make the code more obvious instead of explaining the non-obviousAndreas Gruenbacher2010-01-09
| | | | | * base85: encode_85() does not use the decode tableAndreas Gruenbacher2010-01-09
| | | | | * base85 debug code: Fix length byte calculationAndreas Gruenbacher2010-01-09
| | | | | * checkout -m: do not try to fall back to --merge from an unborn branchJunio C Hamano2010-01-06
| | | | | * branch: die explicitly why when calling "git branch [-a|-r] branchname".Matthieu Moy2009-12-31
| | | | * | textconv: stop leaking file descriptorsJeff King2009-12-30
| | | | * | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-12-29
| | | | |\ \ | | | | | |/
| | | | | * commit: --cleanup is a message optionGreg Price2009-12-29
| | | | | * t7102: make the test fail if one of its check failsNguyễn Thái Ngọc Duy2009-12-29
| | | | * | git count-objects: handle packs bigger than 4GAndreas Schwab2009-12-29
| * | | | | Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano2010-01-18
| |\ \ \ \ \
| | * | | | | Fix mis-backport of t7002Junio C Hamano2010-01-18
* | | | | | | Prevent git blame from segfaulting on a missing author nameDavid Reiss2009-12-22
* | | | | | | rebase -i: abort cleanly if the editor fails to launchBjörn Gustavsson2009-12-19
* | | | | | | technical-docs: document hash APIStephen Boyd2009-12-17
* | | | | | | api-strbuf.txt: fix typos and document launch_editor()Stephen Boyd2009-12-17
* | | | | | | Git 1.6.5.7v1.6.5.7Junio C Hamano2009-12-16
* | | | | | | worktree: don't segfault with an absolute pathspec without a work treeJunio C Hamano2009-12-16
* | | | | | | ignore unknown color configurationJeff King2009-12-16
* | | | | | | help.autocorrect: do not run a command if the command given is junkJohannes Sixt2009-12-15
* | | | | | | Illustrate "filter" attribute with an exampleNanako Shiraishi2009-12-14
* | | | | | | Git 1.6.5.6v1.6.5.6Junio C Hamano2009-12-10
* | | | | | | Fix archive format with -- on the command lineJunio C Hamano2009-12-10
* | | | | | | Remove post-upload-hookJunio C Hamano2009-12-10
* | | | | | | Merge branch 'mm/maint-merge-ff-error-message-fix' into maintJunio C Hamano2009-12-08
|\ \ \ \ \ \ \
| * | | | | | | builtin-merge: show user-friendly error messages for fast-forward too.Matthieu Moy2009-11-29
| * | | | | | | merge-recursive: make the error-message generation an extern functionMatthieu Moy2009-11-29
* | | | | | | | Merge branch 'jn/maint-pull-rebase-error-message' into maintJunio C Hamano2009-12-08
|\ \ \ \ \ \ \ \
| * | | | | | | | pull: clarify advice for the unconfigured error caseJan Krüger2009-12-03
* | | | | | | | | Merge branch 'jk/maint-add-p-delete-fix' into maintJunio C Hamano2009-12-08
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add-interactive: fix deletion of non-empty filesJeff King2009-12-07
* | | | | | | | | | Git 1.6.5.5v1.6.5.5Junio C Hamano2009-12-05
* | | | | | | | | | Fix diff -B/--dirstat miscounting of newly added contentsLinus Torvalds2009-12-05
* | | | | | | | | | reset: improve worktree safety valvesJeff King2009-12-05
* | | | | | | | | | Documentation: Avoid use of xmlto --stringparamTodd Zullinger2009-12-05
* | | | | | | | | | archive: clarify description of path parameterRené Scharfe2009-12-04
* | | | | | | | | | rerere: don't segfault on failure to open rr-cacheJeff King2009-12-04
* | | | | | | | | | Prepare for 1.6.5.5Junio C Hamano2009-12-03
* | | | | | | | | | Merge branch 'uk/maint-shortlog-encoding' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t4201: use ISO8859-1 rather than ISO-8859-1Brandon Casey2009-12-03
| * | | | | | | | | | shortlog: respect commit encodingUwe Kleine-König2009-11-25
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fc/maint-format-patch-pathspec-dashes' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: add test for parsing of "--"Felipe Contreras2009-11-26
| * | | | | | | | | | format-patch: fix parsing of "--" on the command lineFelipe Contreras2009-11-26
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ap/maint-merge-strategy-list-fix' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \