repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ym/fix-opportunistic-index-update-race' into maint
2014-06-25
Junio C Hamano
Merg
e
branch 'ym/f
i
x-opportunistic-index-upda
t
e-rac
e
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio
C
Hamano
Merge b
r
anch '
m
k/show-s
-
n
o
-
extra
-
blank-line-
f
or
-
merge
s
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio
C
H
a
mano
Merge
b
r
anc
h
'rr/reb
a
se-autostash
-
fix' into
mai
n
t
commit
|
commitdiff
|
tree
2014-06-25
Junio
C Hamano
Merge bra
n
ch
'jc/shor
t
log-r
e
f-exc
l
ude' into ma
i
nt
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio C Hamano
M
e
r
ge branch 'j
l
/r
e
mote
-
rm-pru
n
e' into maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C
H
amano
Merge branch 'fc/rerere-conflict-style' into
maint
commit
|
commitdiff
|
tree
2014-06-25
Junio
C
H
amano
Me
r
g
e
branc
h
'rs/
p
a
c
k-ob
j
ec
t
s-no-unn
e
cessary-realloc
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Ham
a
no
Merge branch 'd
t
/m
e
rge-
r
e
cursive-cas
e
-insensitive
'
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Mer
g
e
b
ranch 'rs/m
a
ilinfo-hea
d
er-cmp' in
t
o maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hama
n
o
Merge br
a
nch
'
jk/inde
x
-pack
-
re
p
ort-missi
n
g' int
o
maint
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio C Hamano
M
erge b
r
anch 'nd/index-pack-one-
f
d
-
per-thre
a
d' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
M
e
rge branch 'sk/spawn-less-case-insens
i
tively-from
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Haman
o
Merge
branch 'nd/
d
aemonize-gc' into maint
commit
|
commitdiff
|
tree
2014-06-25
Junio
C
Hamano
Me
r
ge b
r
anch
'jk/diff-
f
o
llow-mus
t
-t
a
ke-one-p
a
thspec
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Me
r
g
e branch 'jk/diff-files-assume-unchan
g
ed' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hama
n
o
M
e
rge branch 'jk/com
m
it-C-pick-empty' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
M
erge
branch 'bc/bla
m
e-
c
rl
f
-te
s
t' into
maint
commit
|
commitdiff
|
tree
2014-06-25
Ju
n
io C Hamano
Me
r
g
e b
r
anch 'jx/blame-align-relative-time' in
t
o m
a
int
commit
|
commitdiff
|
tree
2014-06-25
Juni
o
C Hamano
Merge branch 'jc/apply-ig
n
ore-whitesp
a
c
e
' i
n
to
m
aint
commit
|
commitdiff
|
tree
2014-06-25
Junio
C Hamano
Mer
g
e branch 'jk/c
o
mple
t
e-merge-pull' into mai
n
t
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hama
n
o
M
erge branch 'ow/
c
onfi
g
-
mai
l
ma
p
-pathn
a
me' in
t
o maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
M
e
rge b
r
anch 'as/pretty-
t
runcate' into maint
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio
C Ham
a
no
M
erge branch
'jc/
r
evision-dash-count-parsing' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio C Hamano
Merge branch 'jk/r
e
p
o
rt-fail-to-read-o
b
jects-better
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio
C
Ha
m
ano
Merge branc
h
'mn/sideband-no-ans
i
' into
ma
i
n
t
commit
|
commitdiff
|
tree
2014-06-25
Jun
i
o C Ha
m
ano
M
e
r
ge branc
h
'je/pager-do-n
o
t
-recurse' into maint
commit
|
commitdiff
|
tree
2014-06-12
Junio
C Hamano
Merg
e
b
r
anch
'
jc/rev-pa
r
se-a
r
gh-dashed-mu
l
ti
-
wor
d
s
.
.
.
commit
|
commitdiff
|
tree
2014-06-12
Jace
k
K
o
nieczny
pull: do not abuse 'brea
k
'
in
s
ide a shell 'case'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-09
Junio C H
a
m
ano
re
v
ision: pars
e
"
git log -<
c
ount>" m
o
re c
a
reful
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-04
Junio C Hamano
shortlo
g
: allow -
-
e
x
clud
e
=<
g
lob> to be pa
s
sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-04
Jeff King
update-ind
e
x
: f
i
x segfault with missing --cacheinfo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-02
René Scharfe
p
ack-
o
b
ject
s
: use
f
ree()+xcal
l
oc() instead
o
f
x
r
e
alloc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-02
René S
c
harfe
mailinfo: u
s
e strcmp() f
o
r string c
o
mparis
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-02
Micha
e
l Naumov
s
ideband
.
c: do not
use A
N
SI co
n
trol sequence on non
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-30
Juni
o
C
Hamano
Sync with 1
.
9
.
4
commit
|
commitdiff
|
tree
2014-05-30
Junio C
H
amano
Gi
t
1
.
9
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-30
J
eff
K
i
ng
t5537
:
re-drop
http t
e
sts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-28
Junio C Hamano
Merge branch 'rh/pr
o
m
pt-p
c
mode-avoid-eval-on-refnam
e
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Junio C Ha
m
ano
M
erge bra
n
ch '
m
w/symlinks' into
m
aint
commit
|
commitdiff
|
tree
2014-05-28
Junio C Hamano
Git 2
.
0
commit
|
commitdiff
|
tree
2014-05-27
Øystein Walle
c
o
nfig:
r
e
s
pect '~' and '~user' in mailmap
.
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-27
Nguyễn
Thái Ngọc Duy
gc
--
a
uto: do
not lo
c
k r
e
fs
in the
b
ackgro
u
nd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-27
Jens Lindst
r
öm
re
m
ote
pru
n
e: optimize "dangling symref" check
/
warn
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-27
J
e
ns Lindst
r
öm
remote: repack packed-refs once
w
h
en
dele
t
i
n
g multiple
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
c
o
mpletion: add
missing options for git-mer
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-27
John Ke
e
ping
complet
i
on:
ad
d
a note that merge options are s
h
are
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-23
Je
n
s Li
n
dst
r
ö
m
remot
e
rm:
delete re
m
o
t
e config
u
ration as the last
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Junio C Hamano
Upda
t
e d
r
aft rele
a
se
note
s
to 2
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Alexey Shumkin
pretty
.
c:
f
ormat st
r
ing with
tr
u
ncate respect
s
logOutpu
t
Enc
o
ding
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Alex
e
y Shumkin
t4205, t6006
:
add tes
t
s that fail with i18n
.
logOutputEn
c
odin
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Alexe
y
Shumkin
t4205 (log-pr
e
tty-f
o
rmat
)
:
u
se `tform
a
t
` rather than
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Alexey Shumki
n
t4041,
t4205, t6006, t7102: don't
hardc
o
de tested encoding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Junio C
H
a
m
ano
G
i
t 2
.
0-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Jason St
.
John
RelNotes/2
.
0
.
0
.
txt: Fix se
v
eral grammar
issues, notably
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Ju
n
io C Hamano
Revert "Merge branch 'jc/graduat
e
-remot
e
-
hg-bzr' (ea
r
ly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Matthieu Moy
rebase -i: test "Not
h
i
n
g t
o
d
o
"
cas
e
with autostash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Jeff King
move "--
f
ollow needs one
p
a
t
hspec
"
rule
to diff_setup_do
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Jun
i
o C Ham
a
no
Merge
b
ran
c
h 'jc/
g
raduat
e
-remote-hg-
b
z
r'
(
e
arly
p
a
rt)
commit
|
commitdiff
|
tree
2014-05-20
Junio C Hamano
remot
e
-h
e
lpers: p
o
int
a
t th
e
ir ups
t
ream repos
i
tories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Felip
e
Contreras
c
o
ntrib:
r
e
mote-
h
el
p
ers:
a
dd move warning
s
(v
2
.
0)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
J
unio C
H
am
a
no
Re
v
ert "Merge branch 'fc/t
r
ansport-helper-
s
ync-error
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
Junio C Hama
n
o
Me
r
ge
b
ra
n
ch 'rh/prompt-pcmode
-
avoid-eval-on
-
refname'
commit
|
commitdiff
|
tree
2014-05-19
Richard Hansen
git-prompt
.
s
h:
d
on't assume the shell expa
n
ds the value
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
R
amkumar Ramacha
n
dra
rebas
e
-i:
h
a
ndle "Nothing
t
o
d
o
" case with autostas
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
Alexey Shumkin
t42
0
5 (log-
p
r
e
tty-formats): don't
hardc
o
de SHA-1 in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
J
u
nio C Hamano
M
erge
b
ranch 'lt/re
q
ue
s
t-pull'
commit
|
commitdiff
|
tree
2014-05-19
Junio
C Hamano
Mer
g
e branch 'jl/use-vs
a
tisfy-correctly-for-2
.
0'
commit
|
commitdiff
|
tree
2014-05-19
J
uni
o
C Hamano
Merge git
:
//github
.
com
/
git-
l
10n/git-po
commit
|
commitdiff
|
tree
2014-05-19
J
u
nio C
Hamano
M
e
rge branch 'kb/fast-hashmap'
commit
|
commitdiff
|
tree
2014-05-19
An
d
e
rs Kaseorg
Docu
m
entation/technical/ap
i
-hashmap: re
m
ove
so
u
rce
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
J
e
n
s
L
ehmann
git-gui:
tolerate major
v
ersion changes when comparin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-16
J
u
nio C
H
amano
r
e
quest-pull: r
e
surrect
f
or-lin
u
s
-> ta
g
s/fo
r
-linus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-15
Johannes Schindelin
git
grep -O -i
:
if
t
he pager is 'less', p
a
ss the
'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-15
Jeff
K
ing
open_sha1_file: report "most interesting" er
r
no
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-15
Je
f
f King
r
un_diff_f
i
les
:
do not lo
o
k at unini
t
ialized sta
t
data
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-15
M
a
x Kirillov
git-s
h
ow: f
i
x 'git show
-s' to not
add extra ter
m
inator
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-13
Junio C Haman
o
Merge branch
'
fc/prompt-zsh-r
e
a
d-fro
m
-file'
commit
|
commitdiff
|
tree
2014-05-13
Felipe Cont
r
era
s
contrib: completion: fix 'eread()'
n
ame
s
pace
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-12
Jeff King
i
n
dex-
p
ack: dist
i
n
gu
i
sh missin
g
o
b
jects from type
errors
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-12
J
u
n
io C Ha
m
a
n
o
Me
r
ge
g
i
t://
g
ithub
.
com/git-
l
1
0
n/git-
p
o
commit
|
commitdiff
|
tree
2014-05-09
Junio
C Hama
n
o
Git
2
.
0-r
c
3
commit
|
commitdiff
|
tree
2014-05-09
Junio
C Hamano
Sync wit
h
1
.
9
.
3
commit
|
commitdiff
|
tree
2014-05-09
Junio
C Hamano
Git 1
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
br
i
an m
.
carl
s
o
n
blame: c
o
rr
e
ctly hand
l
e files regardless of autocrlf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
David Tu
r
ner
mv
:
allow r
e
namin
g
to fix c
a
se on case
i
nsensitive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
Jun
i
o C Hamano
Sync w
i
th maint
commit
|
commitdiff
|
tree
2014-05-08
Jonathan
Nieder
s
h
e
l
l doc:
remove s
t
ray "+"
i
n e
x
am
p
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
Junio C Ham
a
no
Merge g
i
t://github
.
c
om/gi
t
-l10n/git-po
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Sta
r
t preparing for 1
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Me
r
ge b
r
anch 'cl/p4-use-diff-tree' into maint
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Me
r
ge branch 'rh/prompt-pcmode-avoid
-
eva
l
-on-r
e
fname
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Merge bra
n
ch 'km/avoid-non-function-return
-
in-reb
a
se
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Junio C
Hamano
Merge branch 'tb/unicode-6
.
3-zero-width' into mai
n
t
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Merge branch 'km/avoid-bs-in-shell-glob' into maint
commit
|
commitdiff
|
tree
2014-05-08
Jun
i
o C Hamano
Merge
branch 'km/avoid-cp-a' into maint
commit
|
commitdiff
|
tree
2014-05-07
J
unio C Hama
n
o
Update draft release note
s
for 2
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-07
J
unio C Hamano
Merge br
a
nch 'cl/p4-use-diff-tree
'
commit
|
commitdiff
|
tree
2014-05-07
David Tur
n
er
merge-recursive
.
c: fix case-changing
m
erge b
u
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-07
Tolga
C
eylan
g
it-p4: format-patch to
d
iff-tree
c
hange
b
rea
k
s b
i
na
r
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-07
Øyv
i
nd A
.
Holm
Re
l
Notes/2
.
0
.
0: Gr
a
mmar an
d
typo fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next