aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin2008-12-24
* GIT 1.6.1v1.6.1Junio C Hamano2008-12-24
* Merge branch 'js/rebase-i-p'Junio C Hamano2008-12-24
|\
| * rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin2008-12-24
| * rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt2008-12-21
| * Show a failure of rebase -p if the merge had a conflictJohannes Sixt2008-12-21
* | t9129: skip the last three tests if UTF-8 locale is not availableMiklos Vajna2008-12-22
* | GIT 1.6.1-rc4v1.6.1-rc4Junio C Hamano2008-12-21
* | Always show which directory is not a git repositoryRichard Hartmann2008-12-21
* | Make help entries alphabeticalRichard Hartmann2008-12-21
* | Merge branch 'maint'Junio C Hamano2008-12-21
|\ \
| * | doc/git-fsck: change the way for getting heads' SHA1sMarkus Heidelberg2008-12-21
* | | git-revert documentation: refer to new HOWTO on reverting faulty mergesBoyd Stephen Smith Jr2008-12-21
* | | git-revert: record the parent against which a revert was madeRobin Rosenberg2008-12-21
* | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-12-21
|\ \ \
| * | | gitk: Force the focus to the main window on WindowsJohannes Sixt2008-12-22
| * | | gitk: Allow unbalanced quotes/braces in commit headersKevin Ballard2008-12-22
| * | | gitk: Update German translationChristian Stimming2008-12-22
| * | | gitk: Mark forgotten strings (header sentence parts in color chooser) for tra...Christian Stimming2008-12-22
| * | | gitk: Ensure that "Reset branch" menu entry is enabledJohannes Sixt2008-12-22
| * | | gitk: Use check-buttons' -text property instead of separate labelsJohannes Sixt2008-12-22
| * | | gitk: Map / to focus the search boxGiuseppe Bilotta2008-12-22
| * | | gitk: Fix bugs in blaming codePaul Mackerras2008-12-06
* | | | Documentation/git-show-branch: work around "single quote" typesetting glitchMarkus Heidelberg2008-12-21
* | | | send-email: futureproof split_addrs() subJunio C Hamano2008-12-21
* | | | Make sure lockfiles are unlocked when dying on SIGPIPEJunio C Hamano2008-12-21
* | | | fast-import.c: stricter strtoul check, silence compiler warningRené Scharfe2008-12-21
* | | | connect.c: stricter port validation, silence compiler warningRené Scharfe2008-12-21
* | | | Add a documentat on how to revert a faulty mergeNanako Shiraishi2008-12-21
* | | | Remove the requirement opaquelocktoken uri schemeKirill A. Korinskiy2008-12-21
* | | | git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dirMarcel M. Cary2008-12-21
| |_|/ |/| |
* | | Documentation: fix typos, grammar, asciidoc syntaxMarkus Heidelberg2008-12-19
* | | Merge branch 'maint' to sync with GIT 1.6.0.6Junio C Hamano2008-12-19
|\ \ \ | | |/ | |/|
| * | GIT 1.6.0.6v1.6.0.6Junio C Hamano2008-12-19
| |\ \
| | * \ GIT 1.5.6.6v1.5.6.6Junio C Hamano2008-12-16
| | |\ \
| | | * \ GIT 1.5.5.6v1.5.5.6Junio C Hamano2008-12-16
| | | |\ \
| | | | * | GIT 1.5.4.7v1.5.4.7Junio C Hamano2008-12-16
| | | | * | gitweb: do not run "git diff" that is PorcelainJunio C Hamano2008-12-16
| * | | | | fast-import: make tagger information optionalJunio C Hamano2008-12-19
| * | | | | fast-export: deal with tag objects that do not have a taggerJohannes Schindelin2008-12-19
| * | | | | SubmittingPatches: mention the usage of real name in Signed-off-by: linesMiklos Vajna2008-12-19
| * | | | | git-mergetool: properly handle "git mergetool -- filename"David Aguilar2008-12-19
| * | | | | git-send-email: handle email address with quoted commaWu Fengguang2008-12-19
| * | | | | Documentation: fix typos, grammar, asciidoc syntaxMarkus Heidelberg2008-12-19
* | | | | | Documentation: sync example output with git outputMarkus Heidelberg2008-12-19
* | | | | | Fix type-mismatch compiler warning from diff_populate_filespec()René Scharfe2008-12-18
* | | | | | test overlapping ignore patternsMichael J Gruber2008-12-18
* | | | | | Merge branch 'lt/readlink'Junio C Hamano2008-12-17
|\ \ \ \ \ \
| * | | | | | combine-diff.c: use strbuf_readlink()Junio C Hamano2008-12-17
| * | | | | | builtin-blame.c: use strbuf_readlink()Junio C Hamano2008-12-17