summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-02-181-40/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | user-manual: use -o latest.tar.gz to create a gzipped tarballW. Trevor King2013-02-181-3/+12
| * | | | | | | | | | | | | | | | | | | | | user-manual: use 'git config --global user.*' for setupW. Trevor King2013-02-181-5/+13
| * | | | | | | | | | | | | | | | | | | | | user-manual: mention 'git remote add' for remote branch configW. Trevor King2013-02-181-27/+13
| * | | | | | | | | | | | | | | | | | | | | user-manual: give 'git push -f' as an alternative to +masterW. Trevor King2013-02-181-0/+7
| * | | | | | | | | | | | | | | | | | | | | user-manual: use 'remote add' to setup push URLsW. Trevor King2013-02-181-5/+10
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2013-02-183-1873/+2284
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | l10n: zh_CN.po: translate 35 new messagesJiang Xin2013-02-181-625/+767
| * | | | | | | | | | | | | | | | | | | | | l10n: vi.po: update new strings (2004t0u0f)Tran Ngoc Quan2013-02-171-647/+795
| * | | | | | | | | | | | | | | | | | | | | l10n: Update git.pot (35 new, 14 removed messages)Jiang Xin2013-02-141-601/+722
* | | | | | | | | | | | | | | | | | | | | | Git 1.8.2-rc0v1.8.2-rc0Junio C Hamano2013-02-182-1/+14
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/hidden-refs'Junio C Hamano2013-02-187-30/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | upload/receive-pack: allow hiding ref hierarchiesJunio C Hamano2013-02-077-1/+146
| * | | | | | | | | | | | | | | | | | | | | | upload-pack: simplify request validationJunio C Hamano2013-01-291-17/+11
| * | | | | | | | | | | | | | | | | | | | | | upload-pack: share more codeJunio C Hamano2013-01-191-17/+14
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-186-1/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-165-1/+53
| * | | | | | | | | | | | | | | | | | | | | | | config: Introduce diff.algorithm variableMichal Privoznik2013-01-163-0/+42
| * | | | | | | | | | | | | | | | | | | | | | | git-completion.bash: Autocomplete --minimal and --histogram for git-diffMichal Privoznik2013-01-141-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mw/bash-prompt-show-untracked-config'Junio C Hamano2013-02-182-4/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | t9903: add extra tests for bash.showDirtyStateMartin Erik Werner2013-02-131-1/+37
| * | | | | | | | | | | | | | | | | | | | | | | | t9903: add tests for bash.showUntrackedFilesMartin Erik Werner2013-02-131-0/+40
| * | | | | | | | | | | | | | | | | | | | | | | | shell prompt: add bash.showUntrackedFiles optionMartin Erik Werner2013-02-131-3/+8
| | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rebase-i-comment-char'Junio C Hamano2013-02-182-40/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | rebase -i: respect core.commentcharJohn Keeping2013-02-122-40/+58
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/read-commit-buffer-data-after-free'Junio C Hamano2013-02-182-7/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | log: re-encode commit messages before greppingJeff King2013-02-112-7/+78
* | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-151-0/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'wk/man-deny-current-branch-is-default-these-days'Junio C Hamano2013-02-151-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | user-manual: Update for receive.denyCurrentBranch=refuseW. Trevor King2013-02-141-3/+4
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mk/make-rm-depdirs-could-be-empty'Junio C Hamano2013-02-151-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Makefile: don't run "rm" without any filesMatt Kraai2013-02-131-2/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/config-local-completion'Junio C Hamano2013-02-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | completion: support 'git config --local'Matthieu Moy2013-02-121-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ef/non-ascii-parse-options-error-diag'Junio C Hamano2013-02-151-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | parse-options: report uncorrupted multi-byte optionsErik Faye-Lund2013-02-121-1/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mk/old-expat'Junio C Hamano2013-02-153-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Allow building with xmlparse.hMatt Kraai2013-02-113-0/+11
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/p4merge-mktemp-fix'Junio C Hamano2013-02-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | p4merge: fix printf usageDavid Aguilar2013-02-101-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git-add: kill remaining <filepattern>Junio C Hamano2013-02-151-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-02-141-0/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diff-graph-cleanup'Junio C Hamano2013-02-144-114/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | combine-diff.c: teach combined diffs about line prefixJohn Keeping2013-02-121-17/+30
| * | | | | | | | | | | | | | | | | | | | | | | | | | diff.c: use diff_line_prefix() where applicableJohn Keeping2013-02-121-95/+20
| * | | | | | | | | | | | | | | | | | | | | | | | | | diff: add diff_line_prefix functionJohn Keeping2013-02-122-0/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | diff.c: make constant string arguments constJohn Keeping2013-02-121-2/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | diff: write prefix to the correct fileJohn Keeping2013-02-121-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | graph: output padding for merge subsequent parentsJohn Keeping2013-02-071-0/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/status-show-in-progress'Junio C Hamano2013-02-143-41/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \