aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge early parts from git://ozlabs.org/~paulus/gitk.gitJunio C Hamano2014-06-26
|\
| * gitk: Show staged submodules regardless of ignore configJens Lehmann2014-06-15
| * gitk: Allow displaying time zones from author and commit dates timestampsAnders Kaseorg2014-06-15
| * gitk: Switch to patch mode when searching for line originMax Kirillov2014-06-15
| * gitk: Replace SHA1 entry field on keyboard pasteIlya Bobyr2014-06-15
| * gitk: Merge branch 'new' of https://github.com/vnwildman/gitkPaul Mackerras2014-02-21
| |\
| | * l10n: Init Vietnamese translationTrần Ngọc Quân2013-12-14
* | | Merge git://repo.or.cz/git-guiJunio C Hamano2014-06-26
|\ \ \
| * | | git-gui: tolerate major version changes when comparing the git versionJens Lehmann2014-06-13
| * | | git-gui: show staged submodules regardless of ignore configJens Lehmann2014-06-13
* | | | Sync with maintJunio C Hamano2014-06-25
|\ \ \ \
| * | | | Git 2.0.1v2.0.1Junio C Hamano2014-06-25
| * | | | Merge branch 'na/no-http-test-in-the-middle' into maintJunio C Hamano2014-06-25
| |\ \ \ \
| * \ \ \ \ Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ym/fix-opportunistic-index-update-race' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/shortlog-ref-exclude' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jl/remote-rm-prune' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'fc/rerere-conflict-style' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/pack-objects-no-unnecessary-realloc' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/merge-recursive-case-insensitive' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/mailinfo-header-cmp' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-report-missing' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-one-fd-per-thread' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/daemonize-gc' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-files-assume-unchanged' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jx/blame-align-relative-time' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/complete-merge-pull' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ow/config-mailmap-pathname' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'as/pretty-truncate' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/revision-dash-count-parsing' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/report-fail-to-read-objects-better' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mn/sideband-no-ansi' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'je/pager-do-not-recurse' into maintJunio C Hamano2014-06-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fifth batch for 2.1Junio C Hamano2014-06-25
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jm/dedup-name-compare'Junio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup duplicate name_compare() functionsJeremiah Mahler2014-06-20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name-hash.c: replace cache_name_compare() with memcmp(3)Jeremiah Mahler2014-06-20
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ep/avoid-test-a-o'Junio C Hamano2014-06-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-submodule.sh: avoid "echo" path-like valuesJunio C Hamano2014-06-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-submodule.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-09
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-09
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-09
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 07:59:36 +0000