summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rm: reuse strbuf for all remove_dir_recursively() calls, againrs/strbuf-cleanup-in-rmdir-recursivelyRené Scharfe2017-02-131-3/+3
* Merge branch 'sb/submodule-rm-absorb'Junio C Hamano2017-01-184-129/+107
|\
| * rm: absorb a submodules git dir before deletionStefan Beller2016-12-272-87/+36
| * submodule: rename and add flags to ok_to_remove_submoduleStefan Beller2016-12-273-14/+45
| * submodule: modernize ok_to_remove_submodule to use argv_arrayStefan Beller2016-12-271-10/+4
| * submodule.h: add extern keyword to functionsStefan Beller2016-12-271-25/+30
* | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-01-1820-117/+904
|\ \
| * | grep: search history of moved submodulesBrandon Williams2016-12-222-2/+59
| * | grep: enable recurse-submodules to work on <tree> objectsBrandon Williams2016-12-224-9/+211
| * | grep: optionally recurse into submodulesBrandon Williams2016-12-224-20/+386
| * | grep: add submodules as a grep source typeBrandon Williams2016-12-222-1/+16
| * | submodules: load gitmodules file from commit sha1Brandon Williams2016-12-226-7/+25
| * | submodules: add helper to determine if a submodule is initializedBrandon Williams2016-12-222-0/+24
| * | submodules: add helper to determine if a submodule is populatedBrandon Williams2016-12-222-0/+16
| * | real_path: canonicalize directory separators in root partsJohannes Sixt2016-12-221-12/+17
| * | real_path: have callers use real_pathdup and strbuf_realpathBrandon Williams2016-12-127-13/+16
| * | real_path: create real_pathdupBrandon Williams2016-12-122-0/+14
| * | real_path: convert real_path_internal to strbuf_realpathBrandon Williams2016-12-122-28/+27
| * | real_path: resolve symlinks by handBrandon Williams2016-12-121-61/+129
* | | Merge git://ozlabs.org/~paulus/gitkJunio C Hamano2017-01-1815-382/+1901
|\ \ \
| * | | gitk: Remove translated message from commentsDavid Aguilar2017-01-181-15/+0
| * | | gitk: ru.po: Update Russian translationDimitriy Ryazantcev2016-12-311-314/+356
| * | | gitk: Update copyright notice to 2016Paul Mackerras2016-12-1214-31/+31
| * | | gitk: Clear array 'commitinfo' on reloadMarkus Hitter2016-12-121-1/+2
| * | | gitk: Remove closed file descriptors from $blobdifffdMarkus Hitter2016-12-121-0/+5
| * | | gitk: Turn off undo manager in the text widgetMarkus Hitter2016-12-121-1/+1
| * | | gitk: Fix Japanese translation for "marked commit"Satoshi Yasushima2016-12-121-4/+5
| * | | gitk: Fix missing commits when using -S or -GStefan Dotterweich2016-12-121-1/+4
| * | | gitk: Use explicit RGB green instead of "lime"Paul Mackerras2016-12-121-6/+6
| * | | gitk: Add Portuguese translationVasco Almeida2016-12-121-0/+1376
| * | | gitk: Makefile: create install bin directoryVasco Almeida2016-12-121-0/+1
| * | | gitk: Include commit title in branch dialogRogier Goossens2016-12-121-1/+6
| * | | gitk: Allow checking out a remote branchRogier Goossens2016-12-121-5/+31
| * | | gitk: Add a 'rename' option to the branch context menuRogier Goossens2016-12-121-11/+85
* | | | RelNotes: drop merge-later comments for maintJunio C Hamano2017-01-171-44/+0
* | | | Merge branch 'maint'Junio C Hamano2017-01-172-1/+122
|\ \ \ \
| * | | | Almost ready for 2.11.1Junio C Hamano2017-01-174-3/+124
| * | | | Merge branch 'mm/gc-safety-doc' into maintJunio C Hamano2017-01-172-9/+29
| |\ \ \ \
| * \ \ \ \ Merge branch 'mm/push-social-engineering-attack-doc' into maintJunio C Hamano2017-01-176-22/+51
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maintJunio C Hamano2017-01-171-3/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ls/filter-process' into maintJunio C Hamano2017-01-174-29/+24
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'kh/tutorial-grammofix' into maintJunio C Hamano2017-01-171-6/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'lr/doc-fix-cet' into maintJunio C Hamano2017-01-171-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/t3600-cleanup' into maintJunio C Hamano2017-01-171-73/+51
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/readme-gmane-is-no-more' into maintJunio C Hamano2017-01-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/unpack-trees-grammofix' into maintJunio C Hamano2017-01-172-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/t0021-fixup' into maintJunio C Hamano2017-01-171-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2017-01-171-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/qsort-in-merge-recursive' into maintJunio C Hamano2017-01-171-9/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dt/smart-http-detect-server-going-away' into maintJunio C Hamano2017-01-175-4/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \