summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | branch: delete symref branch, not its targetRené Scharfe2012-10-182-1/+12
| * | | | | | | branch: factor out delete_branch_config()René Scharfe2012-10-181-5/+10
| * | | | | | | branch: factor out check_branch_commit()René Scharfe2012-10-181-12/+21
* | | | | | | | Merge branch 'nd/grep-true-path' into maintJunio C Hamano2012-11-184-17/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: stop looking at random places for .gitattributesNguyễn Thái Ngọc Duy2012-10-124-17/+51
* | | | | | | | | Merge branch 'jc/grep-pcre-loose-ends' (early part) into maintJunio C Hamano2012-11-185-128/+204
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | log --grep: use the same helper to set -E/-F options as "git grep"Junio C Hamano2012-10-092-2/+8
| * | | | | | | | | revisions: initialize revs->grep_filter using grep_init()Junio C Hamano2012-10-092-2/+9
| * | | | | | | | | grep: move pattern-type bits support to top-level grep.[ch]Junio C Hamano2012-10-093-39/+45
| * | | | | | | | | grep: move the configuration parsing logic to grep.[ch]Junio C Hamano2012-10-093-131/+134
| * | | | | | | | | builtin/grep.c: make configuration callback more reusableJunio C Hamano2012-10-091-25/+79
* | | | | | | | | | Merge branch 'da/mergetools-p4' into maintJunio C Hamano2012-11-181-0/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mergetools/p4merge: Handle "/dev/null"David Aguilar2012-10-111-0/+25
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/test-say-color-avoid-echo-escape' into maintJunio C Hamano2012-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-lib: Fix say_color () not to interpret \a\b\c in the messageJunio C Hamano2012-10-111-1/+1
* | | | | | | | | | | Merge branch 'bw/config-lift-variable-name-length-limit' into maintJunio C Hamano2012-11-181-30/+29
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove the hard coded length limit on variable names in config filesBen Walton2012-10-011-30/+29
* | | | | | | | | | | Git 1.8.0v1.8.0Junio C Hamano2012-10-213-10/+19
* | | | | | | | | | | Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-guiJunio C Hamano2012-10-1715-37/+65
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | git-gui 0.17gitgui-0.17.0Pat Thoyts2012-10-171-1/+1
| * | | | | | | | | | git-gui: Don't prepend the prefix if value looks like a full pathAndrew Wong2012-10-171-2/+7
| * | | | | | | | | | git-gui: Detect full path when parsing argumentsAndrew Wong2012-10-171-1/+10
| * | | | | | | | | | git-gui: remove .git/CHERRY_PICK_HEAD after committingBeat Bolli2012-09-171-0/+1
| * | | | | | | | | | git-gui: Fix a loose/lose mistakeBeat Bolli2012-09-171-1/+1
| * | | | | | | | | | git-gui: Fix semi-working shortcuts for unstage and revertVitaly _Vi Shukela2012-09-171-0/+4
| * | | | | | | | | | Merge branch 'rt/trans'Pat Thoyts2012-06-191-18/+18
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | git-gui: de.po: translate "remote" as "extern"Ralf Thielow2012-06-191-14/+14
| | * | | | | | | | | | git-gui: de.po: translate "bare" as "bloß"Ralf Thielow2012-06-191-1/+1
| | * | | | | | | | | | git-gui: de.po: consistently add untranslated hook names within bracesRalf Thielow2012-06-191-3/+3
| * | | | | | | | | | | git-gui: preserve commit messages in utf-8Pat Thoyts2012-04-191-3/+8
| * | | | | | | | | | | git-gui: open console when using --trace on windowsHeiko Voigt2012-03-251-0/+1
| |/ / / / / / / / / /
| * | | | | | | | | | git-gui: fix a typo in po/ filesBenjamin Kerensa2012-03-1010-10/+10
| * | | | | | | | | | git-gui: Use PWD if it exists on Mac OS XMarcus Karlsson2012-03-101-1/+3
| * | | | | | | | | | git-gui: fix git-gui crash due to uninitialized variableClemens Buchacher2012-01-221-0/+1
* | | | | | | | | | | Git 1.8.0-rc3v1.8.0-rc3Junio C Hamano2012-10-172-5/+4
* | | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2012-10-172-914/+913
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/nafmo/git-l10n-svJiang Xin2012-10-171-441/+438
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | l10n: Update Swedish translation (1964t0f0u)Peter Krefting2012-10-161-441/+438
| * | | | | | | | | | | | Merge branch 'master' of git://github.com/vnwildman/gitJiang Xin2012-10-171-473/+475
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | l10n: vi.po: update from v1.8.0-rc2-4-g42e55Tran Ngoc Quan2012-10-171-473/+475
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Sync with 1.7.12.4Junio C Hamano2012-10-172-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | / / / / / | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Git 1.7.12.4v1.7.12.4maint-1.7.12Junio C Hamano2012-10-174-3/+27
| * | | | | | | | | | | Merge branch 'jk/maint-http-half-auth-push' into maintJunio C Hamano2012-10-173-6/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/git-uri-doc' into maintJunio C Hamano2012-10-171-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/cp-a-is-gnuism' into maintJunio C Hamano2012-10-173-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/doc-ignore' into maintJunio C Hamano2012-10-171-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/doc-long-options' into maintJunio C Hamano2012-10-171-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-t1450-fsck-order-fix' into maintJunio C Hamano2012-10-171-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/test-use-shell-path-not-shell' into maintJunio C Hamano2012-10-171-16/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/test-make-sure-we-have-git' into maintJunio C Hamano2012-10-172-10/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \