summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-176-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-172-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-172-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-172-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-141-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-141-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-141-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-141-1/+4
|\ \ \ \ \ \ \
| * | | | | | | parse-options: report uncorrupted multi-byte optionsErik Faye-Lund2013-02-111-1/+4
* | | | | | | | Merge branch 'mk/old-expat'Junio C Hamano2013-02-143-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow building with xmlparse.hMatt Kraai2013-02-113-0/+11
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'da/p4merge-mktemp-fix'Junio C Hamano2013-02-141-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | p4merge: fix printf usageDavid Aguilar2013-02-101-1/+1
* | | | | | | | | Documentation/git-add: kill remaining <filepattern>Junio C Hamano2013-02-141-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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | status: show the branch name if possible in in-progress infoNguyễn Thái Ngọc Duy2013-02-053-41/+142
* | | | | | | | | | | Merge branch 'mm/remote-mediawiki-build'Junio C Hamano2013-02-144-43/+43
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-remote-mediawiki: use toplevel's MakefileMatthieu Moy2013-02-083-40/+11
| * | | | | | | | | | | Makefile: make script-related rules usable from subdirectoriesMatthieu Moy2013-02-081-3/+32
* | | | | | | | | | | | Merge branch 'bw/get-tz-offset-perl'Junio C Hamano2013-02-144-13/+35
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cvsimport: format commit timestamp ourselves without using strftimeBen Walton2013-02-091-1/+4
| * | | | | | | | | | | | perl/Git.pm: fix get_tz_offset to properly handle DST boundary casesBen Walton2013-02-091-3/+3
| * | | | | | | | | | | | Move Git::SVN::get_tz to Git::get_tz_offsetBen Walton2013-02-093-12/+31
* | | | | | | | | | | | | Merge branch 'al/mergetool-printf-fix'Junio C Hamano2013-02-142-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | difftool--helper: fix printf usageDavid Aguilar2013-02-101-1/+1
| * | | | | | | | | | | | | git-mergetool: print filename when it contains %Asheesh Laroia2013-02-081-1/+1
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/error-const-return'Junio C Hamano2013-02-141-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use __VA_ARGS__ for all of error's argumentsMatt Kraai2013-02-081-5/+5
* | | | | | | | | | | | | | Merge branch 'jx/utf8-printf-width'Junio C Hamano2013-02-143-2/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add utf8_fprintf helper that returns correct number of columnsJiang Xin2013-02-113-2/+25