summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation: clarify how "git commit" cleans up the edited log messagefg/document-commit-message-strippingFredrik Gustafsson2015-04-271-4/+7
* Git 2.4.0-rc3v2.4.0-rc3Junio C Hamano2015-04-221-1/+1
* Sync with maintJunio C Hamano2015-04-212-1/+15
|\
| * Git 2.3.6v2.3.6Junio C Hamano2015-04-214-3/+17
| * Merge branch 'jk/colors' into maintJunio C Hamano2015-04-211-2/+7
| |\
| * \ Merge branch 'jk/test-annoyances' into maintJunio C Hamano2015-04-215-15/+24
| |\ \
| * \ \ Merge branch 'pt/enter-repo-comment-fix' into maintJunio C Hamano2015-04-211-8/+3
| |\ \ \
| * \ \ \ Merge branch 'jz/gitweb-conf-doc-fix' into maintJunio C Hamano2015-04-211-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/cherry-pick-docfix' into maintJunio C Hamano2015-04-211-1/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'iu/fix-parse-options-h-comment' into maintJunio C Hamano2015-04-211-2/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jg/cguide-we-cannot-count' into maintJunio C Hamano2015-04-211-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/pack-corruption-post-mortem' into maintJunio C Hamano2015-04-211-0/+237
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maintJunio C Hamano2015-04-211-4/+0
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | RelNotes: "merge --quiet" change has been revertedJunio C Hamano2015-04-211-4/+0
* | | | | | | | | | | Hopefully the last batch for 2.4Junio C Hamano2015-04-201-1/+18
* | | | | | | | | | | Merge branch 'ps/grep-help-all-callback-arg'Junio C Hamano2015-04-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | grep: correctly initialize help-all optionps/grep-help-all-callback-argPatrick Steinhardt2015-04-121-1/+1
* | | | | | | | | | | | Merge branch 'tb/connect-ipv6-parse-fix'Junio C Hamano2015-04-203-16/+24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | connect.c: ignore extra colon after hostnametb/connect-ipv6-parse-fixTorsten Bögershausen2015-04-083-16/+24
* | | | | | | | | | | | | Merge branch 'va/fix-git-p4-tests'Junio C Hamano2015-04-201-12/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t9814: guarantee only one source exists in git-p4 copy testsVitor Antunes2015-04-121-15/+31
| * | | | | | | | | | | | | git-p4: fix copy detection testVitor Antunes2015-03-281-1/+4
| * | | | | | | | | | | | | t9814: fix broken shell syntax in git-p4 rename testVitor Antunes2015-03-281-2/+2
* | | | | | | | | | | | | | Merge branch 'jc/push-cert'Junio C Hamano2015-04-201-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | push --signed: tighten what the receiving end can ask to signjc/push-certJunio C Hamano2015-04-021-0/+23
* | | | | | | | | | | | | | | Merge branch 'ma/bash-completion-leaking-x'Junio C Hamano2015-04-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | completion: fix global bash variable leak on __gitcompappendma/bash-completion-leaking-xMárcio Almada2015-04-121-1/+1
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-guiJunio C Hamano2015-04-1810-1773/+4690
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-gui: set version 0.20gitgui-0.20.0Pat Thoyts2015-04-181-1/+1
| * | | | | | | | | | | | | | | git-gui: sv.po: Update Swedish translation (547t0f0u)Peter Krefting2015-04-181-1431/+1562
| * | | | | | | | | | | | | | | git-gui i18n: Updated Bulgarian translation (547t,0f,0u)Alexander Shopov2015-04-181-1498/+1528
| * | | | | | | | | | | | | | | git-gui: Makes chooser set 'gitdir' to the resolved pathRemi Rampin2015-03-071-3/+8
| * | | | | | | | | | | | | | | git-gui: Fixes chooser not accepting gitfilesRemi Rampin2015-03-071-0/+10
| * | | | | | | | | | | | | | | git-gui: reinstate support for Tcl 8.4Kyle J. McKay2015-01-131-2/+2
| * | | | | | | | | | | | | | | git-gui: fix problem with gui.maxfilesdisplayedCsaba Kiraly2015-01-051-9/+12
| * | | | | | | | | | | | | | | git-gui: fix verbose loading when git path contains spaces.Pat Thoyts2014-11-071-3/+3
| * | | | | | | | | | | | | | | git-gui/gitk: Do not depend on Cygwin's "kill" command on WindowsSebastian Schuberth2014-11-061-3/+1
| * | | | | | | | | | | | | | | git-gui: add configurable tab size to the diff viewMichael Lutz2014-10-063-1/+21
| * | | | | | | | | | | | | | | git-gui: Make git-gui lib dir configurable at runimeDavid Turner2014-08-103-3/+13
| * | | | | | | | | | | | | | | git-gui i18n: Updated Bulgarian translation (520t,0f,0u)Alexander Shopov2014-08-101-1537/+1527
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'vnwildman/master'Pat Thoyts2014-06-291-0/+2690
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | L10n: vi.po (543t): Init translation for VietnameseTrần Ngọc Quân2014-06-281-0/+2690
| * | | | | | | | | | | | | | | | git-gui: align the new recursive checkbox with the radiobuttons.Pat Thoyts2014-06-131-1/+1
| * | | | | | | | | | | | | | | | git-gui: Add a 'recursive' checkbox in the clone menu.Henri GEIST2014-06-131-2/+32
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Revert "merge: pass verbosity flag down to merge-recursive"Junio C Hamano2015-04-161-4/+0
* | | | | | | | | | | | | | | | Git 2.4.0-rc2v2.4.0-rc2Junio C Hamano2015-04-142-3/+20
* | | | | | | | | | | | | | | | Merge branch 'jk/colors'Junio C Hamano2015-04-141-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | diff-highlight: do not split multibyte charactersjk/colorsKyle J. McKay2015-04-041-2/+7
* | | | | | | | | | | | | | | | Merge branch 'jk/merge-quiet'Junio C Hamano2015-04-141-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | merge: pass verbosity flag down to merge-recursiveJeff King2015-04-021-0/+4
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |