Code

Update 20160403#111

Code

Open

okuryu wants to merge 65 commits intoprogit:masterprogit/progit2-ja:masterfrom

okuryu:update-20160403-2okuryu/progit2-ja:update-20160403-2Copy head branch name to clipboard

Commits

Commits on Feb 11, 2016

• Add '.swp' as temp Vim extension in example

  Show description for 97f4d8c
  hedrok

  committed
  97f4d8c

  Copy full SHA for 97f4d8c

• Fix 'sort' and 'uniq' order

  hedrok

  committed
  2309d87

  Copy full SHA for 2309d87

• Add warning about different hashes

  Show description for ccb917b
  hedrok

  committed
  ccb917b

  Copy full SHA for ccb917b

• Fix sizes before gc and add change of branch

  Show description for 5773f4c
  hedrok

  committed
  5773f4c

  Copy full SHA for 5773f4c

Commits on Feb 17, 2016

• Remove --detach from local-git-daemon.conf

  Show description for ae89e10
  sselberg

  committed
  ae89e10

  Copy full SHA for ae89e10

• Merge pull request #529 from sselberg/dont-detach-upstart-git-daemon

  Show description for 3488168
  ben

  committed
  3488168

  Copy full SHA for 3488168

• Fix review issue: another -> a different

  hedrok

  committed
  52c2d20

  Copy full SHA for 52c2d20

• Merge pull request #521 from hedrok/small-fixes

  Show description for 6d0d5d2
  ben

  committed
  6d0d5d2

  Copy full SHA for 6d0d5d2

Commits on Feb 18, 2016

• Fix issue #531: git pull is for current branch

  YueLinHo

  committed
  7959a06

  Copy full SHA for 7959a06

Commits on Feb 19, 2016

• Merge pull request #532 from YueLinHo/fix_i531

  Show description for 504c661
  ben

  committed
  504c661

  Copy full SHA for 504c661

• Use 'half' instead of '½'

  hedrok

  committed
  4d42b2d

  Copy full SHA for 4d42b2d

• Merge pull request #535 from hedrok/fix-half

  Show description for 6346b40
  ben

  committed
  6346b40

  Copy full SHA for 6346b40

Commits on Feb 20, 2016

• Fix issue #526: There is no *adding* remote repositories in previous sections.

  Show description for e48f376
  YueLinHo

  committed
  e48f376

  Copy full SHA for e48f376

• Fix issue #534: `git remote rename` does not rename *a* reference

  Show description for ff1ee82
  YueLinHo

  committed
  ff1ee82

  Copy full SHA for ff1ee82

Commits on Feb 22, 2016

• Merge pull request #528 from YueLinHo/fix_i526

  Show description for ad2b23b
  ben

  committed
  ad2b23b

  Copy full SHA for ad2b23b

• Merge pull request #537 from YueLinHo/fix_i534

  Show description for 1f2b9ae
  ben

  committed
  1f2b9ae

  Copy full SHA for 1f2b9ae

• Fix issue #530: Explaining `fetch` command via the word "pull" may confuses the newbie

  YueLinHo

  committed
  26f85d6

  Copy full SHA for 26f85d6

• Fix issue #533: Not all local branches can merge with its remote-tracking branch by a single git pull command at once

  Show description for d4d9cff
  YueLinHo

  committed
  d4d9cff

  Copy full SHA for d4d9cff

Commits on Feb 24, 2016

• Merge pull request #538 from YueLinHo/fix_i530

  Show description for 84ffb5b
  ben

  committed
  84ffb5b

  Copy full SHA for 84ffb5b

• Merge pull request #536 from YueLinHo/fix_i533

  Show description for c839655
  ben

  committed
  c839655

  Copy full SHA for c839655

• git-credential-read-only should match against username

  jouve

  committed
  522c8ce

  Copy full SHA for 522c8ce

Commits on Feb 25, 2016

• Merge pull request #542 from jouve/cred_ro_helper

  Show description for d4d130b
  ben

  committed
  d4d130b

  Copy full SHA for d4d130b

• Fix cmdline in credentials.asc

  toolness

  committed
  69e4e5b

  Copy full SHA for 69e4e5b

• Fix read-only cmdline in credentials.asc

  toolness

  committed
  0c5c2f4

  Copy full SHA for 0c5c2f4

• Merge pull request #544 from toolness/patch-1

  Show description for 33a43e2
  ben

  committed
  33a43e2

  Copy full SHA for 33a43e2

Commits on Feb 26, 2016

• Fix issue #541: Add TortoiseGit config for bugtraq and icon

  Show description for 08755f3
  YueLinHo

  committed
  08755f3

  Copy full SHA for 08755f3

• Merge pull request #543 from YueLinHo/TortoiseGit_config

  Show description for 948c189
  ben

  committed
  948c189

  Copy full SHA for 948c189

Commits on Feb 27, 2016

• fixed to be more precise

  KennethKinLum

  committed
  bff3bf6

  Copy full SHA for bff3bf6

• fixed to be more precise

  KennethKinLum

  committed
  7b8059f

  Copy full SHA for 7b8059f

• fixed to be more precise

  KennethKinLum

  committed
  2889141

  Copy full SHA for 2889141

• more idiomatic

  KennethKinLum

  committed
  670e1cc

  Copy full SHA for 670e1cc

Commits on Feb 28, 2016

• more idiomatic

  KennethKinLum

  committed
  b2d82d5

  Copy full SHA for b2d82d5

• more idiomatic

  KennethKinLum

  committed
  2e89435

  Copy full SHA for 2e89435

• Merge pull request #546 from KennethKinLum/fixed-to-be-more-precise

  Show description for 6f4d813
  ben

  committed
  6f4d813

  Copy full SHA for 6f4d813

Commits on Mar 2, 2016

• Fix issue #548: git checkout command copy the file for you

  Show description for f895d4f
  YueLinHo

  committed
  f895d4f

  Copy full SHA for f895d4f

• Merge pull request #549 from YueLinHo/fix_i548

  Show description for f61c876
  ben

  committed
  f61c876

  Copy full SHA for f61c876

Commits on Mar 8, 2016

• Fix issue #551: Missing backtick(`)

  YueLinHo

  committed
  3084de5

  Copy full SHA for 3084de5

• Merge pull request #552 from YueLinHo/fix_i551

  Show description for 3f34aa2
  ben

  committed
  3f34aa2

  Copy full SHA for 3f34aa2

Commits on Mar 9, 2016

• Add recommendation note

  Show description for 06c3352
  nemoinho

  committed
  06c3352

  Copy full SHA for 06c3352

Commits on Mar 14, 2016

• Update note about --no-metadata

  Show description for 03e4935
  nemoinho

  committed
  03e4935

  Copy full SHA for 03e4935

• Fix issue #554: The output of 'git status' is out-of-date

  YueLinHo

  committed
  3f9540c

  Copy full SHA for 3f9540c

• Delete duplicate space

  YueLinHo

  committed
  43f2b74

  Copy full SHA for 43f2b74

• Fix issue #448: 3.2 Git Branching -- possibly wrong explanation (upstream vs. downstream)

  YueLinHo

  committed
  3a04918

  Copy full SHA for 3a04918

Commits on Mar 15, 2016

• Merge pull request #555 from nemoinho/issue/550

  Show description for ace799b
  ben

  committed
  ace799b

  Copy full SHA for ace799b

• Merge pull request #559 from YueLinHo/fix_i554

  Show description for 8267a20
  ben

  committed
  8267a20

  Copy full SHA for 8267a20

• Fix issue #557: Not precise statement for those two columns of `git status -s`

  YueLinHo

  committed
  a912093

  Copy full SHA for a912093

• Fix issue #312: /srv/git instead of /opt/git for server repositories

  YueLinHo

  committed
  62e5d0a

  Copy full SHA for 62e5d0a

Commits on Mar 16, 2016

• Merge pull request #564 from YueLinHo/i448

  Show description for aba5cf5
  ben

  committed
  aba5cf5

  Copy full SHA for aba5cf5

• Merge pull request #558 from YueLinHo/fix_i557

  Show description for 761be20
  ben

  committed
  761be20

  Copy full SHA for 761be20

• Merge pull request #567 from YueLinHo/i312

  Show description for ec75603
  ben

  committed
  ec75603

  Copy full SHA for ec75603

• Fix issue #502: Doubled explanation in one paragraph of 5.2 Contributing..., subsec. Private small team

  YueLinHo

  committed
  6d479d5

  Copy full SHA for 6d479d5

• Fix issue #384: There's no Git for Windows 2.x

  Show description for 9e2d254
  YueLinHo

  committed
  9e2d254

  Copy full SHA for 9e2d254

Commits on Mar 21, 2016

• Update json to 1.8.3

  Show description for c95902a
  boltomli

  committed
  c95902a

  Copy full SHA for c95902a

Commits on Mar 22, 2016

• Merge pull request #568 from YueLinHo/i502

  Show description for c404a2b
  ben

  committed
  c404a2b

  Copy full SHA for c404a2b

• Merge pull request #565 from YueLinHo/i384

  Show description for b92c81b
  ben

  committed
  b92c81b

  Copy full SHA for b92c81b

• Merge pull request #574 from boltomli/master

  Show description for 6054c33
  ben

  committed
  6054c33

  Copy full SHA for 6054c33

• Fix issue #553: Git does the checkout while cloning, not "you".

  YueLinHo

  committed
  7ca6f55

  Copy full SHA for 7ca6f55

• Merge pull request #575 from YueLinHo/i553

  Show description for f3531c7
  ben

  committed
  f3531c7

  Copy full SHA for f3531c7

Commits on Apr 2, 2016

• Fix issue #577: One command is `git mv`, instead of `mv`.

  YueLinHo

  committed
  3072c43

  Copy full SHA for 3072c43

• Fix issue #579: Need autotools for installing git from source

  YueLinHo

  committed
  29a5bea

  Copy full SHA for 29a5bea

Commits on Apr 3, 2016

• Merge pull request #581 from YueLinHo/i579

  Show description for d5f78b6
  ben

  committed
  d5f78b6

  Copy full SHA for d5f78b6

• Merge pull request #580 from YueLinHo/i577

  Show description for e95aba0
  ben

  committed
  e95aba0

  Copy full SHA for e95aba0

Commits on Mar 4, 2020

• Merge commit 'e95aba0b236ab57b8ea9a1ef1b4fdae6339573ec' into update-20160403-2

  okuryu

  committed
  a735b3f

  Copy full SHA for a735b3f

• Translate changes up to e95aba0b236ab57b8ea9a1ef1b4fdae6339573ec

  okuryu

  committed
  bb9bd69

  Copy full SHA for bb9bd69

Commits on Mar 5, 2020

• Re-landing changes at 63dfdd1847eacb09c2994893baf0bc1e2b85c609

  okuryu

  committed
  1109f5e

  Copy full SHA for 1109f5e