summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Documentation: correct example restore from bundleKirill Brilliantov2013-01-011-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'as/test-name-alias-uniquely'Junio C Hamano2013-01-081-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Use longer alias names in subdirectory testsAaron Schrab2012-12-281-6/+6
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ta/remove-stale-translated-tut'Junio C Hamano2013-01-081-675/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Remove Documentation/pt_BR/gittutorial.txtThomas Ackermann2012-12-271-675/+0
* | | | | | | | | | | | | | | | | Merge branch 'tb/test-t9810-no-sed-i'Junio C Hamano2013-01-081-10/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t9810: Do not use sed -iTorsten Bögershausen2013-01-011-10/+14
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'tb/test-t9020-no-which'Junio C Hamano2013-01-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t9020: which is not portableTorsten Bögershausen2013-01-011-2/+2
* | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-fast-import-doc-dedup-done'Junio C Hamano2013-01-081-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-fast-import-doc-dedup-done'Junio C Hamano2013-01-081-5/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | git-fast-import(1): remove duplicate '--done' optionJohn Keeping2013-01-081-5/+2
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pathspec-literal'Junio C Hamano2013-01-081-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | t6130-pathspec-noglob: Windows does not allow a file named "f*"Johannes Sixt2013-01-061-1/+7
* | | | | | | | | | | | | | | | | | | | Merge branch 'mz/oneway-merge-wo-u-no-lstat'Junio C Hamano2013-01-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | oneway_merge(): only lstat() when told to update worktreeMartin von Zweigbergk2012-12-201-1/+1
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'cc/no-gitk-build-dependency'Junio C Hamano2013-01-062-15/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Makefile: replace "echo 1>..." with "echo >..."Christian Couder2012-12-181-5/+5
| * | | | | | | | | | | | | | | | | | | | Makefile: detect when PYTHON_PATH changesChristian Couder2012-12-182-2/+15
| * | | | | | | | | | | | | | | | | | | | Makefile: remove tracking of TCLTK_PATHChristian Couder2012-12-182-15/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/warn-on-inaccessible-loosen'Junio C Hamano2013-01-065-7/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | config: exit on error accessing any config fileJonathan Nieder2012-10-141-3/+3
| * | | | | | | | | | | | | | | | | | | | | doc: advertise GIT_CONFIG_NOSYSTEMJonathan Nieder2012-10-142-0/+12
| * | | | | | | | | | | | | | | | | | | | | config: treat user and xdg config permission problems as errorsJonathan Nieder2012-10-133-2/+11
| * | | | | | | | | | | | | | | | | | | | | config, gitignore: failure to access with ENOTDIR is okJonathan Nieder2012-10-132-2/+5
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-trailing-blank-removal'Junio C Hamano2013-01-061-6/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | apply.c:update_pre_post_images(): the preimage can be truncatedJunio C Hamano2012-10-121-6/+17
* | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-01-061-2/+43
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'wk/submodule-update-remote'Junio C Hamano2013-01-056-2/+117
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | submodule add: If --branch is given, record it in .gitmodulesW. Trevor King2012-12-193-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | submodule update: add --remote for submodule's upstream changesW. Trevor King2012-12-195-2/+84
| * | | | | | | | | | | | | | | | | | | | | | | submodule: add get_submodule_config helper funtionW. Trevor King2012-12-111-0/+26
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pathspec-literal'Junio C Hamano2013-01-055-11/+115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | add global --literal-pathspecs optionJeff King2012-12-195-6/+107
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/error-const-return'Junio C Hamano2013-01-056-9/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | silence some -Wuninitialized false positivesJeff King2012-12-154-9/+17
| * | | | | | | | | | | | | | | | | | | | | | | make error()'s constant return value more visibleJeff King2012-12-152-0/+12
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/format-color-auto'Junio C Hamano2013-01-055-8/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | log --format: teach %C(auto,black) to respect color configJunio C Hamano2012-12-175-4/+72
| * | | | | | | | | | | | | | | | | | | | | | | | t6006: clean up whitespaceJunio C Hamano2012-12-171-4/+4
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/complete-commit-c'Junio C Hamano2013-01-051-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | completion: complete refs for "git commit -c"Jeff King2012-12-151-0/+7
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ja/directory-attrs'Junio C Hamano2013-01-053-9/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Add directory pattern matching to attributesJean-Noël AVILA2012-12-173-9/+76
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/mailmap-from-blob'Junio C Hamano2013-01-057-38/+214
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | mailmap: default mailmap.blob in bare repositoriesJeff King2012-12-133-3/+35
| * | | | | | | | | | | | | | | | | | | | | | | | | | mailmap: fix some documentation loose-ends for mailmap.blobJeff King2012-12-132-2/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | mailmap: clean up read_mailmap error handlingJeff King2012-12-121-11/+21
| * | | | | | | | | | | | | | | | | | | | | | | | | | mailmap: support reading mailmap from blobsJeff King2012-12-125-2/+129
| * | | | | | | | | | | | | | | | | | | | | | | | | | mailmap: refactor mailmap parsing for non-file sourcesJeff King2012-12-121-34/+40