repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'fc/rerere-conflict-style' into maint
2014-06-25
Junio C Hamano
Merge branch 'fc/rerere-
c
onf
l
i
c
t-style'
i
nto ma
i
n
t
commit
|
commitdiff
|
tree
2014-06-25
Junio
C Hamano
Merge branch 'rs/pack-o
b
jects-no-unn
e
c
essary-realloc
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio
C
Ha
m
a
n
o
Merge
b
ranc
h
'dt
/
merge-r
e
c
ursive-case-insensitive'
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio
C
H
amano
Merg
e
br
a
nc
h
'rs/mai
l
info-header-cmp' into mai
n
t
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio C Hamano
Merge branch
'jk/index-pack-r
e
port
-
missin
g
' into
m
aint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
M
e
rge bra
n
ch 'nd/i
n
dex-pack-one-fd-per-thread' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio C
Hamano
Merge bra
n
ch 'sk/spawn-less-case-insensitive
l
y-fro
m
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Ha
m
ano
Merge branch 'nd/
d
a
e
m
onize-
g
c' into m
a
in
t
commit
|
commitdiff
|
tree
2014-06-25
Ju
n
io C Hama
n
o
Merge branch 'jk/
d
i
ff-fo
l
low-must-take-one-pathsp
e
c
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Ham
a
no
Merge branch 'jk/diff-f
i
les-assume-unchanged
'
into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Jun
i
o
C Hamano
Merg
e
branch 'j
k
/commit-C-pick-empty' into ma
i
nt
commit
|
commitdiff
|
tree
2014-06-25
Jun
i
o C Hamano
M
e
r
g
e branch 'bc/blame-c
r
lf-te
s
t'
i
n
t
o maint
commit
|
commitdiff
|
tree
2014-06-25
Juni
o
C Hamano
Mer
g
e branch 'j
x
/blame-align-relative
-
time' i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge branc
h
'
j
c
/app
l
y-ign
o
r
e-whitespace' into maint
commit
|
commitdiff
|
tree
2014-06-25
J
u
n
i
o
C Hamano
Me
r
ge branch 'jk/complet
e
-merge-pull' i
n
to maint
commit
|
commitdiff
|
tree
2014-06-25
J
unio C Hamano
Merge bra
n
ch 'ow/config-mailm
a
p-pathname' into maint
commit
|
commitdiff
|
tree
2014-06-25
Juni
o
C Hamano
Merge branch 'as/
p
retty-truncate
'
into
maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C
H
amano
M
erge br
a
nch 'jc/revision-dash-count-parsing' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C
Hamano
Me
r
ge branch
'j
k
/
report-fail-to-read
-
objects-b
e
tter
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Ju
n
io C
H
ama
n
o
Mer
g
e
branch 'mn/sid
e
b
and-no
-
an
s
i' into mai
n
t
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge branch
'
j
e/pager-d
o
-not-recurse' i
n
to
m
a
i
nt
commit
|
commitdiff
|
tree
2014-06-12
Junio C H
a
mano
Merg
e
branch 'jc/rev
-
pars
e
-argh-dashed-mu
l
ti-wor
d
s
.
.
.
commit
|
commitdiff
|
tree
2014-06-12
Jacek Konieczny
pull: do not abus
e
'br
e
ak' insid
e
a
s
hell 'case'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-09
Junio C H
a
mano
revisio
n
: par
s
e "git log -<c
o
u
n
t>"
m
ore careful
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-04
Jeff King
update-index
:
f
i
x seg
f
ault
w
i
t
h
missing -
-
cacheinfo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-02
René
Scharfe
pack-ob
j
ec
t
s
:
u
s
e
free()+xcalloc(
)
instead
o
f
xrealloc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-02
R
e
né Sch
a
rfe
ma
i
linfo: use
s
trcmp() for str
i
ng c
o
mpariso
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-02
Micha
e
l Naumo
v
sideband
.
c: do not
us
e
ANS
I
control seq
u
ence on non
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-30
J
unio
C Haman
o
Sync wit
h
1
.
9
.
4
commit
|
commitdiff
|
tree
2014-05-30
Junio C
Ham
a
no
Git 1
.
9
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-30
Jeff Ki
n
g
t5537: re-drop http t
e
sts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-28
Juni
o
C Hamano
Merge branc
h
'rh/p
r
ompt
-
pcmode-avo
i
d-eval
-
on-
r
efname
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
J
u
nio C Hamano
Merge b
r
anch '
m
w
/
symlinks' into
ma
i
nt
commit
|
commitdiff
|
tree
2014-05-28
Juni
o
C Hamano
Git 2
.
0
commit
|
commitdiff
|
tree
2014-05-27
Øystein Wal
l
e
c
o
nfig: respect '~' and '~user' in mailmap
.
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-27
N
guyễn
T
h
á
i Ng
ọ
c
Duy
g
c
--auto: do n
o
t lock re
f
s i
n
the backgr
o
und
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-27
Jo
h
n Keeping
comple
t
ion: add missing options for git-merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
com
p
letion: ad
d
a no
t
e that mer
g
e opti
o
ns are shared
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Junio C Ha
m
ano
Update draft r
e
lease
n
o
tes
to 2
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Alexey S
h
umkin
pret
t
y
.
c: form
a
t string with truncate res
p
ects logOutputEnc
o
ding
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Alexey Shumkin
t4205, t6006: add tests that
f
ail wit
h
i18n
.
logOutput
E
ncodin
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Alexey Shumki
n
t4205
(
l
og-pret
t
y-for
m
a
t
)
: use `t
f
ormat
`
rather
t
han
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Alexey Shumki
n
t4041, t4
2
0
5
, t
6
006, t7102: don
'
t ha
r
dc
o
de teste
d
e
n
co
d
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
J
u
n
i
o C
Hamano
Git 2
.
0-
r
c4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Jason St
.
John
Rel
N
otes/2
.
0
.
0
.
txt: Fix s
e
veral gram
m
a
r
issues, notably
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Jun
i
o C H
a
mano
Revert "Merg
e
br
a
nch 'jc/gra
d
uate
-
remote-hg-b
z
r'
(e
a
rly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
J
e
f
f Kin
g
move "--follow n
e
eds one path
s
pec" rule to dif
f
_
s
etup
_
done
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
J
u
nio C Hamano
Merge branch
'jc/gradua
t
e-r
e
m
o
t
e-hg-bzr'
(earl
y
pa
r
t)
commit
|
commitdiff
|
tree
2014-05-20
Juni
o
C Ham
a
no
r
e
mote-helpe
r
s: point at
their upstream reposit
o
ries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Felipe
C
o
n
treras
co
n
trib:
r
emote-helpers
:
add
move warnings (
v
2
.
0)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Junio C Hamano
Revert
"
Merge
branch 'fc/t
r
anspo
r
t-helper-sy
n
c
-
erro
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
Junio C Ha
m
ano
Me
r
ge branch 'rh/pro
m
pt-pcmode-avo
i
d-eval-on-ref
n
ame'
commit
|
commitdiff
|
tree
2014-05-19
Richard Hansen
git-prompt
.
sh: don't assu
m
e the shell expands the valu
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
A
l
exey Shumkin
t4205 (
l
og-pret
t
y-formats)
:
don't hardcode SHA-1 in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
Junio C Hamano
Merge branc
h
'lt/reques
t
-pull'
commit
|
commitdiff
|
tree
2014-05-19
Junio C Hamano
M
erge branch
'
jl/use-vsatisf
y
-correctly-f
o
r-2
.
0'
commit
|
commitdiff
|
tree
2014-05-19
Juni
o
C Ham
a
no
Mer
g
e git://github
.
com/
g
it-l10n/git-po
commit
|
commitdiff
|
tree
2014-05-19
Junio C
Hamano
M
erg
e
branch '
k
b/fast-h
a
shmap'
commit
|
commitdiff
|
tree
2014-05-19
Anders Kaseorg
D
o
cumentation/tec
h
ni
c
a
l/api-has
h
m
ap:
remove source
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
Jens
L
ehma
n
n
git
-
gui: tol
e
rate major v
e
r
sion changes
when co
m
paring
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-16
Jun
i
o C Hama
n
o
request-pull: resurrect for-linus -> t
a
gs
/
for-linus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-15
Joh
a
nne
s
Schind
e
lin
git g
r
ep -O -i: if the pager is 'le
s
s', pas
s
the '
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-15
J
e
ff King
op
e
n_sha1_file:
report "most int
e
rest
i
ng" errno
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-15
Jeff
K
ing
run_diff_f
i
les: do
not look at
uninitialized stat data
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-13
Junio C Hamano
Merge branch 'fc/promp
t
-zsh-read-from-fil
e
'
commit
|
commitdiff
|
tree
2014-05-13
Felipe Contreras
contrib
:
complet
i
on:
f
ix 'erea
d
()' names
p
a
c
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-12
Jeff King
i
nd
e
x-pack: distinguish missing objects
f
r
o
m type errors
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-12
Juni
o
C Hamano
Me
r
ge git:/
/
github
.
com
/
git-l10n/git
-
po
commit
|
commitdiff
|
tree
2014-05-09
J
u
nio C Hamano
Git 2
.
0
-rc3
commit
|
commitdiff
|
tree
2014-05-09
Junio C Ham
a
no
Sy
n
c
with
1
.
9
.
3
commit
|
commitdiff
|
tree
2014-05-09
Juni
o
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
.
carlson
blame: corr
e
ctly handle
files regardless of
a
uto
c
rl
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
David Turner
mv: allow renaming to fix cas
e
on case
insensitive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
Junio
C Hamano
S
ync
w
ith m
a
int
commit
|
commitdiff
|
tree
2014-05-08
Jonathan Nieder
shell doc: remo
v
e stray "+" in example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Merge git://githu
b
.
com/git
-
l
1
0n
/
git-po
commit
|
commitdiff
|
tree
2014-05-08
J
unio
C
Haman
o
St
a
rt preparing for 1
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
J
unio C Hamano
M
e
rge
b
ranch 'cl/p4-use-diff
-
t
ree' into ma
i
nt
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Me
r
ge branch 'rh/prompt-pcmod
e
-avo
i
d-e
v
al-on-refn
a
me
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
J
unio C Hama
n
o
Merge branch 'km/avoid-n
o
n-fu
n
cti
o
n-return-in
-
reba
s
e
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Junio
C Hamano
Merge
b
r
a
nch 'tb/unicode-6
.
3-z
e
ro-wi
d
th' int
o
maint
commit
|
commitdiff
|
tree
2014-05-08
Junio
C Hamano
Mer
g
e branch '
k
m/
a
void-bs-in-shell-
g
lob' into mai
n
t
commit
|
commitdiff
|
tree
2014-05-08
Junio
C Hamano
Merge branch 'km/avoid-cp-a' in
t
o main
t
commit
|
commitdiff
|
tree
2014-05-07
Junio C Hamano
Update d
r
aft relea
s
e notes for 2
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-07
Ju
n
io
C
Hamano
Merge bra
n
c
h
'cl/
p
4-u
s
e-diff-tree'
commit
|
commitdiff
|
tree
2014-05-07
David Turner
m
erge
-
r
e
cursive
.
c:
fix case-chang
i
ng
m
erge b
u
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-07
Tolga C
e
ylan
gi
t
-p4:
f
ormat-
p
a
tch to diff-tree change br
e
aks bi
n
ary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-07
Øyvind A
.
H
o
lm
RelNo
t
es/2
.
0
.
0: Grammar and typo fixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-02
Junio C Hamano
Git 2
.
0-rc
2
commit
|
commitdiff
|
tree
2014-05-02
Junio C
H
amano
Merge branch 'm
w
/symlinks'
commit
|
commitdiff
|
tree
2014-05-02
Jun
i
o
C
Hamano
Merge bra
n
c
h 'k
m
/git-svn-workar
o
und-older-geto
p
t-l
o
ng'
commit
|
commitdiff
|
tree
2014-05-02
J
u
nio C H
a
mano
Merge b
r
anch 'rh/prompt-pcmode-avoid-eval-on-
r
efname'
commit
|
commitdiff
|
tree
2014-05-02
J
u
ni
o
C Hamano
Merge br
a
nch 'mk/doc
-
git-
g
ui-disp
l
ay-untr
a
ck
e
d
'
commit
|
commitdiff
|
tree
2014-04-30
Juni
o
C
Hamano
Merge git://gi
t
hu
b
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2014-04-30
Juni
o
C Hamano
Revert the whole
"ask c
u
rl-config" topic for
now
commit
|
commitdiff
|
tree
2014-04-30
Fe
l
ipe Contreras
rerere:
fix for merge
.
conflictstyle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-28
J
ö
rn E
n
gel
pager: do allo
w
spawning
p
ag
e
r recursiv
e
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-28
Junio C Ha
m
a
no
Merge branch
'
d
b
/
m
a
ke-w
i
th-c
u
rl'
commit
|
commitdiff
|
tree
2014-04-28
J
u
ni
o
C Hamano
M
e
rg
e
br
a
n
ch 'jk/externa
l
-diff-u
s
e-argv-array' (e
a
r
l
y
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Dave B
o
rowit
z
Makefile: default to -lcur
l
w
h
e
n
no C
U
RL_CONFIG or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next