Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui | Junio C Hamano | 2015-04-19 | 10 | -1773/+4690 |
|\ | |||||
| * | git-gui: set version 0.20gitgui-0.20.0 | Pat Thoyts | 2015-04-18 | 1 | -1/+1 |
| * | git-gui: sv.po: Update Swedish translation (547t0f0u) | Peter Krefting | 2015-04-18 | 1 | -1431/+1562 |
| * | git-gui i18n: Updated Bulgarian translation (547t,0f,0u) | Alexander Shopov | 2015-04-18 | 1 | -1498/+1528 |
| * | git-gui: Makes chooser set 'gitdir' to the resolved path | Remi Rampin | 2015-03-07 | 1 | -3/+8 |
| * | git-gui: Fixes chooser not accepting gitfiles | Remi Rampin | 2015-03-07 | 1 | -0/+10 |
| * | git-gui: reinstate support for Tcl 8.4 | Kyle J. McKay | 2015-01-13 | 1 | -2/+2 |
| * | git-gui: fix problem with gui.maxfilesdisplayed | Csaba Kiraly | 2015-01-05 | 1 | -9/+12 |
| * | git-gui: fix verbose loading when git path contains spaces. | Pat Thoyts | 2014-11-07 | 1 | -3/+3 |
| * | git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows | Sebastian Schuberth | 2014-11-06 | 1 | -3/+1 |
| * | git-gui: add configurable tab size to the diff view | Michael Lutz | 2014-10-06 | 3 | -1/+21 |
| * | git-gui: Make git-gui lib dir configurable at runime | David Turner | 2014-08-10 | 3 | -3/+13 |
| * | git-gui i18n: Updated Bulgarian translation (520t,0f,0u) | Alexander Shopov | 2014-08-10 | 1 | -1537/+1527 |
| * | Merge remote-tracking branch 'vnwildman/master' | Pat Thoyts | 2014-06-29 | 1 | -0/+2690 |
| |\ | |||||
| | * | L10n: vi.po (543t): Init translation for Vietnamese | Trần Ngọc Quân | 2014-06-28 | 1 | -0/+2690 |
| * | | git-gui: align the new recursive checkbox with the radiobuttons. | Pat Thoyts | 2014-06-13 | 1 | -1/+1 |
| * | | git-gui: Add a 'recursive' checkbox in the clone menu. | Henri GEIST | 2014-06-13 | 1 | -2/+32 |
| |/ | |||||
* | | Revert "merge: pass verbosity flag down to merge-recursive" | Junio C Hamano | 2015-04-16 | 1 | -4/+0 |
* | | Git 2.4.0-rc2v2.4.0-rc2 | Junio C Hamano | 2015-04-14 | 2 | -3/+20 |
* | | Merge branch 'jk/colors' | Junio C Hamano | 2015-04-14 | 1 | -2/+7 |
|\ \ | |||||
| * | | diff-highlight: do not split multibyte characters | Kyle J. McKay | 2015-04-04 | 1 | -2/+7 |
* | | | Merge branch 'jk/merge-quiet' | Junio C Hamano | 2015-04-14 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | merge: pass verbosity flag down to merge-recursive | Jeff King | 2015-04-03 | 1 | -0/+4 |
* | | | | Merge branch 'jk/pack-corruption-post-mortem' | Junio C Hamano | 2015-04-14 | 1 | -0/+237 |
|\ \ \ \ | |||||
| * | | | | howto: document more tools for recovery corruption | Jeff King | 2015-04-02 | 1 | -0/+237 |
* | | | | | Merge branch 'jc/update-instead-into-void' | Junio C Hamano | 2015-04-14 | 2 | -2/+74 |
|\ \ \ \ \ | |||||
| * | | | | | push-to-deploy: allow pushing into an unborn branch and updating it | Junio C Hamano | 2015-04-02 | 2 | -2/+74 |
* | | | | | | Merge branch 'sb/plug-streaming-leak' | Junio C Hamano | 2015-04-14 | 1 | -1/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | streaming.c: fix a memleak | John Keeping | 2015-03-31 | 1 | -1/+4 |
* | | | | | | | Merge branch 'jn/doc-fast-import-no-16-octopus-limit' | Junio C Hamano | 2015-04-14 | 1 | -4/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fast-import doc: remove suggested 16-parent limit | Jonathan Nieder | 2015-04-01 | 1 | -4/+0 |
* | | | | | | | | Merge branch 'sb/plug-wt-shortstatus-tracking-leak' | Junio C Hamano | 2015-04-14 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | wt-status.c: fix a memleak | Stefan Beller | 2015-03-31 | 1 | -0/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'pt/enter-repo-comment-fix' | Junio C Hamano | 2015-04-14 | 1 | -8/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | enter_repo(): fix docs to match code | Paul Tan | 2015-03-31 | 1 | -8/+3 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jz/gitweb-conf-doc-fix' | Junio C Hamano | 2015-04-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | gitweb.conf.txt: say "build-time", not "built-time" | Jérôme Zago | 2015-03-31 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jk/cherry-pick-docfix' | Junio C Hamano | 2015-04-14 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | cherry-pick: fix docs describing handling of empty commits | Jeff King | 2015-03-31 | 1 | -1/+2 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'iu/fix-parse-options-h-comment' | Junio C Hamano | 2015-04-14 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval | Ivan Ukhov | 2015-03-30 | 1 | -2/+1 |
* | | | | | | | | | | Merge branch 'jg/cguide-we-cannot-count' | Junio C Hamano | 2015-04-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | CodingGuidelines: update 'rough' rule count | Julian Gindi | 2015-04-14 | 1 | -1/+1 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge tag 'l10n-2.4.0-rnd2' of git://github.com/git-l10n/git-po | Junio C Hamano | 2015-04-09 | 10 | -8098/+18704 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/alexhenrie/git-po | Jiang Xin | 2015-04-09 | 1 | -236/+236 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | l10n: ca.po: update translation | Alex Henrie | 2015-04-08 | 1 | -236/+236 |
| * | | | | | | | | | | | l10n: TEAMS: Change repository URL of zh_CN | Jiang Xin | 2015-04-09 | 1 | -1/+1 |
| * | | | | | | | | | | | l10n: Updated Bulgarian translation of git (2305t,0f,0u) | Alexander Shopov | 2015-04-07 | 1 | -1436/+1456 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | l10n: sv.po: Update Swedish translation (2305t0f0u) | Peter Krefting | 2015-04-07 | 1 | -241/+244 |
| * | | | | | | | | | | l10n: de.po: translate one message | Ralf Thielow | 2015-04-05 | 1 | -239/+248 |