Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ls/p4-retry-thrice' | Junio C Hamano | 2017-01-18 | 2 | -1/+5 |
|\ | |||||
| * | git-p4: do not pass '-r 0' to p4 commandsls/p4-retry-thrice | Igor Kushnir | 2016-12-29 | 2 | -1/+5 |
* | | Merge branch 'sb/submodule-rm-absorb' | Junio C Hamano | 2017-01-18 | 4 | -129/+107 |
|\ \ | |||||
| * | | rm: absorb a submodules git dir before deletion | Stefan Beller | 2016-12-27 | 2 | -87/+36 |
| * | | submodule: rename and add flags to ok_to_remove_submodule | Stefan Beller | 2016-12-27 | 3 | -14/+45 |
| * | | submodule: modernize ok_to_remove_submodule to use argv_array | Stefan Beller | 2016-12-27 | 1 | -10/+4 |
| * | | submodule.h: add extern keyword to functions | Stefan Beller | 2016-12-27 | 1 | -25/+30 |
* | | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-01-18 | 20 | -117/+904 |
|\ \ \ | |||||
| * | | | grep: search history of moved submodules | Brandon Williams | 2016-12-22 | 2 | -2/+59 |
| * | | | grep: enable recurse-submodules to work on <tree> objects | Brandon Williams | 2016-12-22 | 4 | -9/+211 |
| * | | | grep: optionally recurse into submodules | Brandon Williams | 2016-12-22 | 4 | -20/+386 |
| * | | | grep: add submodules as a grep source type | Brandon Williams | 2016-12-22 | 2 | -1/+16 |
| * | | | submodules: load gitmodules file from commit sha1 | Brandon Williams | 2016-12-22 | 6 | -7/+25 |
| * | | | submodules: add helper to determine if a submodule is initialized | Brandon Williams | 2016-12-22 | 2 | -0/+24 |
| * | | | submodules: add helper to determine if a submodule is populated | Brandon Williams | 2016-12-22 | 2 | -0/+16 |
| * | | | real_path: canonicalize directory separators in root parts | Johannes Sixt | 2016-12-22 | 1 | -12/+17 |
| * | | | real_path: have callers use real_pathdup and strbuf_realpath | Brandon Williams | 2016-12-12 | 7 | -13/+16 |
| * | | | real_path: create real_pathdup | Brandon Williams | 2016-12-12 | 2 | -0/+14 |
| * | | | real_path: convert real_path_internal to strbuf_realpath | Brandon Williams | 2016-12-12 | 2 | -28/+27 |
| * | | | real_path: resolve symlinks by hand | Brandon Williams | 2016-12-12 | 1 | -61/+129 |
* | | | | Merge git://ozlabs.org/~paulus/gitk | Junio C Hamano | 2017-01-18 | 15 | -382/+1901 |
|\ \ \ \ | |||||
| * | | | | gitk: Remove translated message from comments | David Aguilar | 2017-01-18 | 1 | -15/+0 |
| * | | | | gitk: ru.po: Update Russian translation | Dimitriy Ryazantcev | 2016-12-31 | 1 | -314/+356 |
| * | | | | gitk: Update copyright notice to 2016 | Paul Mackerras | 2016-12-12 | 14 | -31/+31 |
| * | | | | gitk: Clear array 'commitinfo' on reload | Markus Hitter | 2016-12-12 | 1 | -1/+2 |
| * | | | | gitk: Remove closed file descriptors from $blobdifffd | Markus Hitter | 2016-12-12 | 1 | -0/+5 |
| * | | | | gitk: Turn off undo manager in the text widget | Markus Hitter | 2016-12-12 | 1 | -1/+1 |
| * | | | | gitk: Fix Japanese translation for "marked commit" | Satoshi Yasushima | 2016-12-12 | 1 | -4/+5 |
| * | | | | gitk: Fix missing commits when using -S or -G | Stefan Dotterweich | 2016-12-12 | 1 | -1/+4 |
| * | | | | gitk: Use explicit RGB green instead of "lime" | Paul Mackerras | 2016-12-12 | 1 | -6/+6 |
| * | | | | gitk: Add Portuguese translation | Vasco Almeida | 2016-12-12 | 1 | -0/+1376 |
| * | | | | gitk: Makefile: create install bin directory | Vasco Almeida | 2016-12-12 | 1 | -0/+1 |
| * | | | | gitk: Include commit title in branch dialog | Rogier Goossens | 2016-12-12 | 1 | -1/+6 |
| * | | | | gitk: Allow checking out a remote branch | Rogier Goossens | 2016-12-12 | 1 | -5/+31 |
| * | | | | gitk: Add a 'rename' option to the branch context menu | Rogier Goossens | 2016-12-12 | 1 | -11/+85 |
* | | | | | RelNotes: drop merge-later comments for maint | Junio C Hamano | 2017-01-17 | 1 | -44/+0 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2017-01-17 | 2 | -1/+122 |
|\ \ \ \ \ | |||||
| * | | | | | Almost ready for 2.11.1 | Junio C Hamano | 2017-01-17 | 4 | -3/+124 |
| * | | | | | Merge branch 'mm/gc-safety-doc' into maint | Junio C Hamano | 2017-01-17 | 2 | -9/+29 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'mm/push-social-engineering-attack-doc' into maint | Junio C Hamano | 2017-01-17 | 6 | -22/+51 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maint | Junio C Hamano | 2017-01-17 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ls/filter-process' into maint | Junio C Hamano | 2017-01-17 | 4 | -29/+24 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'kh/tutorial-grammofix' into maint | Junio C Hamano | 2017-01-17 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'lr/doc-fix-cet' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/t3600-cleanup' into maint | Junio C Hamano | 2017-01-17 | 1 | -73/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/readme-gmane-is-no-more' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/unpack-trees-grammofix' into maint | Junio C Hamano | 2017-01-17 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/t0021-fixup' into maint | Junio C Hamano | 2017-01-17 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ak/lazy-prereq-mktemp' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/qsort-in-merge-recursive' into maint | Junio C Hamano | 2017-01-17 | 1 | -9/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |