Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/hidden-refs' | Junio C Hamano | 2013-02-17 | 7 | -30/+166 |
|\ | |||||
| * | upload/receive-pack: allow hiding ref hierarchies | Junio C Hamano | 2013-02-07 | 7 | -1/+146 |
| * | upload-pack: simplify request validation | Junio C Hamano | 2013-01-28 | 1 | -17/+11 |
| * | upload-pack: share more code | Junio C Hamano | 2013-01-18 | 1 | -17/+14 |
* | | Merge branch 'mp/diff-algo-config' | Junio C Hamano | 2013-02-17 | 6 | -1/+95 |
|\ \ | |||||
| * | | diff: Introduce --diff-algorithm command line option | Michal Privoznik | 2013-01-16 | 5 | -1/+53 |
| * | | config: Introduce diff.algorithm variable | Michal Privoznik | 2013-01-16 | 3 | -0/+42 |
| * | | git-completion.bash: Autocomplete --minimal and --histogram for git-diff | Michal Privoznik | 2013-01-14 | 1 | -1/+1 |
* | | | Merge branch 'mw/bash-prompt-show-untracked-config' | Junio C Hamano | 2013-02-17 | 2 | -4/+85 |
|\ \ \ | |||||
| * | | | t9903: add extra tests for bash.showDirtyState | Martin Erik Werner | 2013-02-13 | 1 | -1/+37 |
| * | | | t9903: add tests for bash.showUntrackedFiles | Martin Erik Werner | 2013-02-13 | 1 | -0/+40 |
| * | | | shell prompt: add bash.showUntrackedFiles option | Martin Erik Werner | 2013-02-13 | 1 | -3/+8 |
* | | | | Merge branch 'jk/rebase-i-comment-char' | Junio C Hamano | 2013-02-17 | 2 | -40/+58 |
|\ \ \ \ | |||||
| * | | | | rebase -i: respect core.commentchar | John Keeping | 2013-02-12 | 2 | -40/+58 |
* | | | | | Merge branch 'jk/read-commit-buffer-data-after-free' | Junio C Hamano | 2013-02-17 | 2 | -7/+78 |
|\ \ \ \ \ | |||||
| * | | | | | log: re-encode commit messages before grepping | Jeff King | 2013-02-11 | 2 | -7/+78 |
* | | | | | | Update draft release notes to 1.8.2 | Junio C Hamano | 2013-02-15 | 1 | -0/+12 |
* | | | | | | Merge branch 'wk/man-deny-current-branch-is-default-these-days' | Junio C Hamano | 2013-02-14 | 1 | -3/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | user-manual: Update for receive.denyCurrentBranch=refuse | W. Trevor King | 2013-02-14 | 1 | -3/+4 |
* | | | | | | | Merge branch 'mk/make-rm-depdirs-could-be-empty' | Junio C Hamano | 2013-02-14 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Makefile: don't run "rm" without any files | Matt Kraai | 2013-02-13 | 1 | -2/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mm/config-local-completion' | Junio C Hamano | 2013-02-14 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | completion: support 'git config --local' | Matthieu Moy | 2013-02-12 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'ef/non-ascii-parse-options-error-diag' | Junio C Hamano | 2013-02-14 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | parse-options: report uncorrupted multi-byte options | Erik Faye-Lund | 2013-02-11 | 1 | -1/+4 |
* | | | | | | | | | Merge branch 'mk/old-expat' | Junio C Hamano | 2013-02-14 | 3 | -0/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Allow building with xmlparse.h | Matt Kraai | 2013-02-11 | 3 | -0/+11 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'da/p4merge-mktemp-fix' | Junio C Hamano | 2013-02-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | p4merge: fix printf usage | David Aguilar | 2013-02-10 | 1 | -1/+1 |
* | | | | | | | | | | Documentation/git-add: kill remaining <filepattern> | Junio C Hamano | 2013-02-14 | 1 | -1/+1 |
* | | | | | | | | | | Update draft release notes to 1.8.2 | Junio C Hamano | 2013-02-14 | 1 | -0/+9 |
* | | | | | | | | | | Merge branch 'jk/diff-graph-cleanup' | Junio C Hamano | 2013-02-14 | 4 | -114/+79 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | combine-diff.c: teach combined diffs about line prefix | John Keeping | 2013-02-12 | 1 | -17/+30 |
| * | | | | | | | | | | diff.c: use diff_line_prefix() where applicable | John Keeping | 2013-02-12 | 1 | -95/+20 |
| * | | | | | | | | | | diff: add diff_line_prefix function | John Keeping | 2013-02-12 | 2 | -0/+13 |
| * | | | | | | | | | | diff.c: make constant string arguments const | John Keeping | 2013-02-12 | 1 | -2/+4 |
| * | | | | | | | | | | diff: write prefix to the correct file | John Keeping | 2013-02-12 | 1 | -1/+1 |
| * | | | | | | | | | | graph: output padding for merge subsequent parents | John Keeping | 2013-02-07 | 1 | -0/+10 |
* | | | | | | | | | | | Merge branch 'nd/status-show-in-progress' | Junio C Hamano | 2013-02-14 | 3 | -41/+142 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | status: show the branch name if possible in in-progress info | Nguyễn Thái Ngọc Duy | 2013-02-05 | 3 | -41/+142 |
* | | | | | | | | | | | | Merge branch 'mm/remote-mediawiki-build' | Junio C Hamano | 2013-02-14 | 4 | -43/+43 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-remote-mediawiki: use toplevel's Makefile | Matthieu Moy | 2013-02-08 | 3 | -40/+11 |
| * | | | | | | | | | | | | Makefile: make script-related rules usable from subdirectories | Matthieu Moy | 2013-02-08 | 1 | -3/+32 |
* | | | | | | | | | | | | | Merge branch 'bw/get-tz-offset-perl' | Junio C Hamano | 2013-02-14 | 4 | -13/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | cvsimport: format commit timestamp ourselves without using strftime | Ben Walton | 2013-02-09 | 1 | -1/+4 |
| * | | | | | | | | | | | | | perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases | Ben Walton | 2013-02-09 | 1 | -3/+3 |
| * | | | | | | | | | | | | | Move Git::SVN::get_tz to Git::get_tz_offset | Ben Walton | 2013-02-09 | 3 | -12/+31 |
* | | | | | | | | | | | | | | Merge branch 'al/mergetool-printf-fix' | Junio C Hamano | 2013-02-14 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | difftool--helper: fix printf usage | David Aguilar | 2013-02-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | git-mergetool: print filename when it contains % | Asheesh Laroia | 2013-02-08 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |