summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'js/format-2047' into maintJunio C Hamano2012-11-205-126/+262
|\ \ \ \ \ \ \ \
| * | | | | | | | format-patch tests: check quoting/encoding in To: and Cc: headersJan H. Schönherr2012-10-181-32/+66
| * | | | | | | | format-patch: fix rfc2047 address encoding with respect to rfc822 specialsJan H. Schönherr2012-10-182-18/+33
| * | | | | | | | format-patch: make rfc2047 encoding more strictJan H. Schönherr2012-10-183-12/+72
| * | | | | | | | format-patch: introduce helper function last_line_length()Jan H. Schönherr2012-10-181-12/+13
| * | | | | | | | format-patch: do not wrap rfc2047 encoded headers too lateJan H. Schönherr2012-10-182-33/+51
| * | | | | | | | format-patch: do not wrap non-rfc2047 headers too earlyJan H. Schönherr2012-10-182-27/+35
| * | | | | | | | utf8: fix off-by-one wrapping of textJan H. Schönherr2012-10-182-3/+3
* | | | | | | | | Start preparing for 1.8.0.1Junio C Hamano2012-11-182-1/+47
* | | | | | | | | Merge branch 'sz/maint-curl-multi-timeout' into maintJunio C Hamano2012-11-181-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix potential hang in https handshakeStefan Zager2012-10-191-0/+12
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'po/maint-refs-replace-docs' into maintJunio C Hamano2012-11-181-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Doc repository-layout: Show refs/replacePhilip Oakley2012-10-251-0/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ph/pull-rebase-detached' into maintJunio C Hamano2012-11-181-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-pull: Avoid merge-base on detached headPhil Hord2012-10-251-0/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mm/maint-doc-remote-tracking' into maintJunio C Hamano2012-11-184-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: remote tracking branch -> remote-tracking branchMatthieu Moy2012-10-254-6/+6
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/branch-del-symref' into maintJunio C Hamano2012-11-182-26/+68
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | branch: show targets of deleted symrefs, not sha1sRené Scharfe2012-10-182-11/+13
| * | | | | | | | branch: skip commit checks when deleting symref branchesRené Scharfe2012-10-182-2/+17
| * | | | | | | | 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