aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* rerere: refactor "replay" part of do_plain_rerere()Junio C Hamano2015-07-24
* rerere: explain the remainderJunio C Hamano2015-07-24
* rerere: explain "rerere forget" codepathJunio C Hamano2015-07-24
* rerere: explain the primary codepathJunio C Hamano2015-07-24
* rerere: explain MERGE_RR management helpersJunio C Hamano2015-07-24
* rerere: fix benign off-by-one non-bug and clarify codeJunio C Hamano2015-07-24
* rerere: explain the rerere I/O abstractionJunio C Hamano2015-07-24
* rerere: do not leak mmfile[] for a path with multiple stage #1 entriesJunio C Hamano2015-07-24
* rerere: stop looping unnecessarilyJunio C Hamano2015-07-24
* rerere: drop want_sp parameter from is_cmarker()Junio C Hamano2015-07-24
* rerere: report autoupdated paths only after actually updating themJunio C Hamano2015-07-24
* rerere: write out each record of MERGE_RR in one goJunio C Hamano2015-07-24
* rerere: lift PATH_MAX limitationJunio C Hamano2015-07-24
* rerere: plug conflict ID leaksJunio C Hamano2015-07-24
* rerere: handle conflicts with multiple stage #1 entriesJunio C Hamano2015-07-24
* rerere: fix an off-by-one non-bugJunio C Hamano2015-06-28
* Git 2.3.8v2.3.8Junio C Hamano2015-05-11
* Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3Junio C Hamano2015-05-11
|\
| * log -L: improve error message on malformed argumentMatthieu Moy2015-04-20
| * Documentation: change -L:<regex> to -L:<funcname>Matthieu Moy2015-04-20
* | Merge branch 'jc/diff-no-index-d-f' into maint-2.3Junio C Hamano2015-05-11
|\ \
| * | diff-no-index: align D/F handling with that of normal GitJunio C Hamano2015-03-26
| * | diff-no-index: DWIM "diff D F" into "diff D/F F"Junio C Hamano2015-03-25
* | | Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3Junio C Hamano2015-05-11
|\ \ \
| * | | config: fix settings in default_user_config templateOssi Herrala2015-04-17
* | | | Merge branch 'jc/epochtime-wo-tz' into maint-2.3Junio C Hamano2015-05-11
|\ \ \ \
| * | | | parse_date_basic(): let the system handle DST conversionJunio C Hamano2015-04-15
| * | | | parse_date_basic(): return early when given a bogus timestampJunio C Hamano2015-04-15
| | |/ / | |/| |
* | | | Git 2.3.7v2.3.7Junio C Hamano2015-04-27
* | | | Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano2015-04-27
|\ \ \ \
| * | | | connect.c: ignore extra colon after hostnameTorsten Bögershausen2015-04-08
* | | | | Merge branch 'ma/bash-completion-leaking-x' into maintJunio C Hamano2015-04-27
|\ \ \ \ \
| * | | | | completion: fix global bash variable leak on __gitcompappendMárcio Almada2015-04-12
| | |/ / / | |/| | |
* | | | | Merge branch 'jc/push-cert' into maintJunio C Hamano2015-04-27
|\ \ \ \ \
| * | | | | push --signed: tighten what the receiving end can ask to signJunio C Hamano2015-04-02
* | | | | | Git 2.3.6v2.3.6Junio C Hamano2015-04-21
* | | | | | Merge branch 'jk/colors' into maintJunio C Hamano2015-04-21
|\ \ \ \ \ \
| * | | | | | diff-highlight: do not split multibyte charactersKyle J. McKay2015-04-04
* | | | | | | Merge branch 'jk/test-annoyances' into maintJunio C Hamano2015-04-21
|\ \ \ \ \ \ \
| * | | | | | | t5551: make EXPENSIVE test cheaperJeff King2015-03-12
| * | | | | | | t5541: move run_with_cmdline_limit to test-lib.shJeff King2015-03-12
| * | | | | | | t: pass GIT_TRACE through ApacheJeff King2015-03-12
| * | | | | | | t: redirect stderr GIT_TRACE to descriptor 4Jeff King2015-03-12
| * | | | | | | t: translate SIGINT to an exitJeff King2015-03-12
* | | | | | | | Merge branch 'pt/enter-repo-comment-fix' into maintJunio C Hamano2015-04-21
|\ \ \ \ \ \ \ \
| * | | | | | | | enter_repo(): fix docs to match codePaul Tan2015-03-31
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jz/gitweb-conf-doc-fix' into maintJunio C Hamano2015-04-21
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb.conf.txt: say "build-time", not "built-time"Jérôme Zago2015-03-31
* | | | | | | | | Merge branch 'jk/cherry-pick-docfix' into maintJunio C Hamano2015-04-21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cherry-pick: fix docs describing handling of empty commitsJeff King2015-03-30