aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'aw/rebase-i-stop-on-failure-to-amend'Junio C Hamano2011-12-16
|\
| * rebase -i: interrupt rebase when "commit --amend" failed during "reword"Andrew Wong2011-11-30
* | Merge branch 'jh/fast-import-notes'Junio C Hamano2011-12-16
|\ \
| * | fast-import: Fix incorrect fanout level when modifying existing notes refsJohan Herland2011-11-28
| * | t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handlingJohan Herland2011-11-28
| * | t9301: Fix testcase covering up a bug in fast-import's notes fanout handlingJohan Herland2011-11-28
* | | Merge branch 'jk/upload-archive-use-start-command'Junio C Hamano2011-12-16
|\ \ \
| * | | upload-archive: use start_command instead of forkJeff King2011-11-21
* | | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2011-12-16
|\ \ \ \
| * | | | gitk: Make vi-style keybindings more vi-likeJonathan Nieder2011-10-08
| * | | | gitk: Make "touching paths" search support backslashesYggy King2011-07-24
| * | | | gitk: Show modified files with separate work treeMartin von Zweigbergk2011-07-24
| * | | | gitk: Simplify calculation of gitdirMartin von Zweigbergk2011-07-24
| * | | | gitk: Run 'git rev-parse --git-dir' only onceMartin von Zweigbergk2011-07-24
| * | | | gitk: Put temporary directory inside .gitMartin von Zweigbergk2011-07-24
| * | | | gitk: Fix "External diff" with separate work treeMartin von Zweigbergk2011-07-24
| * | | | gitk: Fix "blame parent commit" with separate work treeMartin von Zweigbergk2011-07-24
| * | | | gitk: Fix "show origin of this line" with separate work treeMartin von Zweigbergk2011-07-24
| * | | | gitk: Fix file highlight when run in subdirectoryMartin von Zweigbergk2011-07-24
| * | | | gitk: Update copyrightPaul Mackerras2011-07-24
| * | | | gitk: When a commit contains a note, mark it with a yellow boxRaphael Zimmerer2011-05-29
| * | | | gitk: Remember time zones from author and commit timestampsAnders Kaseorg2011-05-29
| * | | | gitk: Remove unused $cdate arrayAnders Kaseorg2011-05-29
* | | | | Update draft release notes to 1.7.9Junio C Hamano2011-12-13
* | | | | Merge branch 'ks/tag-cleanup'Junio C Hamano2011-12-13
|\ \ \ \ \
| * | | | | git-tag: introduce --cleanup optionKirill A. Shutemov2011-12-09
* | | | | | Merge branch 'jl/submodule-status-failure-report'Junio C Hamano2011-12-13
|\ \ \ \ \ \
| * | | | | | diff/status: print submodule path when looking for changes failsJens Lehmann2011-12-08
* | | | | | | Merge branch 'tr/userdiff-c-returns-pointer'Junio C Hamano2011-12-13
|\ \ \ \ \ \ \
| * | | | | | | userdiff: allow * between cpp funcname wordsThomas Rast2011-12-06
* | | | | | | | Merge branch 'bc/maint-apply-check-no-patch'Junio C Hamano2011-12-13
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/apply.c: report error on failure to recognize inputBrandon Casey2011-12-05
| * | | | | | | | t/t4131-apply-fake-ancestor.sh: fix broken testBrandon Casey2011-12-05
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'nd/ignore-might-be-precious'Junio C Hamano2011-12-13
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout,merge: disallow overwriting ignored files with --no-overwrite-ignoreNguyễn Thái Ngọc Duy2011-11-28
| * | | | | | | | Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-preciousJunio C Hamano2011-11-28
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'jn/branch-move-to-self'Junio C Hamano2011-12-13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow checkout -B <current-branch> to update the current branchJonathan Nieder2011-11-28
| * | | | | | | | | | branch: allow a no-op "branch -M <current-branch> HEAD"Jonathan Nieder2011-11-28
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'cn/maint-lf-to-crlf-filter'Junio C Hamano2011-12-13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | convert: track state in LF-to-CRLF filterCarlos Martín Nieto2011-11-28
* | | | | | | | | | | Merge branch 'tj/maint-imap-send-remove-unused'Junio C Hamano2011-12-13
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'maint' into tj/imap-send-remove-unusedJunio C Hamano2011-11-23
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | imap-send: Remove unused 'use_namespace' variableThomas Jarosch2011-11-23
* | | | | | | | | | | | Merge branch 'jk/maint-upload-archive'Junio C Hamano2011-12-13
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archiveJunio C Hamano2011-11-21
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | archive: don't let remote clients get unreachable commitsJeff King2011-11-21
* | | | | | | | | | | | | | Merge branch 'jn/gitweb-side-by-side-diff'Junio C Hamano2011-12-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | gitweb: Add navigation to select side-by-side diffKato Kazuyoshi2011-10-31
| * | | | | | | | | | | | | | gitweb: Use href(-replay=>1,...) for formats links in "commitdiff"Jakub Narebski2011-10-31