summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | git-rebase.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-4/+4
| * | | | | git-rebase--merge.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-2/+2
| * | | | | git-pull.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-1/+1
| * | | | | appp.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-7/+7
| * | | | | t7900-subtree.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-1/+1
| * | | | | test-gitmw-lib.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-3/+3
| * | | | | t9365-continuing-queries.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-1/+1
* | | | | | Merge branch 'fc/rerere-conflict-style'Junio C Hamano2014-06-031-0/+2
|\ \ \ \ \ \
| * | | | | | rerere: fix for merge.conflictstylefc/rerere-conflict-styleFelipe Contreras2014-04-301-0/+2
* | | | | | | Merge branch 'dt/api-doc-setup-gently'Junio C Hamano2014-06-031-5/+8
|\ \ \ \ \ \ \
| * | | | | | | docs: document RUN_SETUP_GENTLY and clarify RUN_SETUPdt/api-doc-setup-gentlyDavid Turner2014-04-301-5/+8
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fc/mergetool-prompt'Junio C Hamano2014-06-032-6/+16
|\ \ \ \ \ \ \
| * | | | | | | mergetool: document the default for --[no-]promptfc/mergetool-promptJunio C Hamano2014-04-241-3/+5
| * | | | | | | mergetool: run prompt only if guessed toolFelipe Contreras2014-04-221-3/+11
* | | | | | | | Merge branch 'mm/mediawiki-encoding-fix'Junio C Hamano2014-06-034-2/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | git-remote-mediawiki: fix encoding issue for UTF-8 media filesmm/mediawiki-encoding-fixMatthieu Moy2014-04-232-1/+25
| * | | | | | | | git-remote-mediawiki: allow stop/start-ing the test serverMatthieu Moy2014-04-232-1/+11
| |/ / / / / / /
* | | | | | | | Merge branch 'sk/tag-contains-wo-recursion'Junio C Hamano2014-06-032-15/+101
|\ \ \ \ \ \ \ \
| * | | | | | | | git tag --contains: avoid stack overflowJean-Jacques Lafay2014-04-252-15/+101
| |/ / / / / / /
* | | | | | | | Merge branch 'ef/send-email-absolute-path-to-the-command'Junio C Hamano2014-06-031-2/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | send-email: windows drive prefix (e.g. C:) appears only at the beginningef/send-email-absolute-path-to-the-commandJunio C Hamano2014-04-231-1/+1
| * | | | | | | | send-email: recognize absolute path on WindowsErik Faye-Lund2014-04-161-2/+14
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jx/blame-align-relative-time'Junio C Hamano2014-06-031-8/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | blame: dynamic blame_date_width for different localesjx/blame-align-relative-timeJiang Xin2014-04-231-1/+8
| * | | | | | | | blame: fix broken time_buf paddings in relative timestampJiang Xin2014-04-231-7/+14
* | | | | | | | | Merge branch 'lr/git-run-setup-gently'Junio C Hamano2014-06-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusivelr/git-run-setup-gentlyLuis R. Rodriguez2014-04-221-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fc/mergetools-vimdiff3'Junio C Hamano2014-06-033-2/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mergetools: add vimdiff3 modefc/mergetools-vimdiff3Felipe Contreras2014-04-223-2/+14
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fc/merge-default-to-upstream'Junio C Hamano2014-06-032-4/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: enable defaulttoupstream by defaultfc/merge-default-to-upstreamFelipe Contreras2014-04-222-4/+3
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/external-diff-use-argv-array'Junio C Hamano2014-06-032-32/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | run_external_diff: refactor cmdline setup logicjk/external-diff-use-argv-arrayJeff King2014-04-211-11/+15
| * | | | | | | | | run_external_diff: hoist common bits out of conditionalJeff King2014-04-211-5/+3
| * | | | | | | | | run_external_diff: drop fflush(NULL)Jeff King2014-04-211-1/+0
| * | | | | | | | | run_external_diff: clean up error handlingJeff King2014-04-212-7/+4
| * | | | | | | | | run_external_diff: use an argv_array for the environmentJeff King2014-04-211-9/+5
* | | | | | | | | | Merge branch 'sk/svn-parse-datestamp'Junio C Hamano2014-06-031-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SVN.pm::parse_svn_date: allow timestamps with a single-digit hoursk/svn-parse-datestampRomanBelinsky2014-04-171-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/ref-update-check-errors-early'Junio C Hamano2014-06-032-4/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit.c: check for lock error and return earlyrs/ref-update-check-errors-earlyRonnie Sahlberg2014-04-171-4/+4
| * | | | | | | | | | sequencer.c: check for lock failure and bail early in fast_forward_toRonnie Sahlberg2014-04-171-0/+4
* | | | | | | | | | | Merge branch 'nd/index-pack-one-fd-per-thread'Junio C Hamano2014-06-033-18/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | index-pack: work around thread-unsafe pread()nd/index-pack-one-fd-per-threadNguyễn Thái Ngọc Duy2014-04-163-18/+17
* | | | | | | | | | | | Merge branch 'ym/fix-opportunistic-index-update-race'Junio C Hamano2014-06-036-5/+90
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | read-cache.c: verify index file before we opportunistically update itym/fix-opportunistic-index-update-raceYiannis Marangos2014-04-103-1/+69
| * | | | | | | | | | | | wrapper.c: add xpread() similar to xread()Yiannis Marangos2014-04-104-4/+21
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-0313-285/+585
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ref_transaction_commit(): work with transaction->updates in placemh/ref-transactionMichael Haggerty2014-04-071-4/+1
| * | | | | | | | | | | | struct ref_update: add a type fieldMichael Haggerty2014-04-071-5/+3