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
Jun
i
o
C Hamano
Merge
branch
'
fc/
r
ere
r
e-conflict
-
style' into maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C
H
a
m
a
n
o
Merge
b
ranch
'
rs/pa
c
k-o
b
jects
-
n
o-unnecessary-rea
l
loc
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Jun
i
o C Hamano
Merge bran
c
h
'dt
/
m
erge-recursive-case-insensitive'
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C
H
amano
Merge branch
'
rs/
m
aili
n
fo-head
e
r-cmp' into maint
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio C H
a
m
ano
Merge bran
c
h
'jk/in
d
ex-pack-
r
e
p
ort-mis
s
ing'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2014-06-25
Junio
C
Hamano
Merg
e
branch 'nd/ind
e
x
-pack-one-fd-per-t
h
read' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio
C Hamano
Merge bran
c
h 'sk/spawn
-
less-cas
e
-insensitively-from
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Ju
n
io
C Hamano
Me
r
g
e
branch 'nd/d
a
emonize-gc'
into ma
i
nt
commit
|
commitdiff
|
tree
2014-06-25
Junio C
H
amano
Merge branch 'j
k
/diff-follow-must-tak
e
-one-pathspec
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C H
a
mano
Merge
b
r
a
nch 'jk/diff-fi
l
es
-
assu
m
e-unchanged' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge branch 'jk/commi
t
-C-pick-empt
y
' into maint
commit
|
commitdiff
|
tree
2014-06-25
Junio
C Hamano
M
e
r
g
e br
a
nch 'b
c
/blame-crlf-test'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2014-06-25
Junio
C Hamano
M
e
rge b
r
anch 'jx/blame-align-r
e
l
ativ
e
-time' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge
b
ra
n
ch 'jc/
a
pply-igno
r
e
-
white
s
pace' in
t
o
maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Me
r
ge br
a
nch 'j
k
/complete-
m
erge
-
pull
'
into maint
commit
|
commitdiff
|
tree
2014-06-25
J
u
n
io C Hamano
M
erge
branc
h
'ow/
c
onfig-mail
m
a
p
-pa
t
hname' into maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C H
a
mano
Merg
e
branch 'as/pr
e
tty
-
truncate' into main
t
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio
C
Ha
m
a
no
Merge
b
ranch '
j
c
/revision-dash-count-parsing' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C H
a
mano
Merge branch 'jk/rep
o
rt-fail-to-read
-
objects-bett
e
r
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Ham
a
no
Mer
g
e branch
'
mn/sideba
n
d
-
no-
a
nsi' into maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge branch
'
je/pa
g
er-do-not-recur
s
e'
i
nt
o
maint
commit
|
commitdiff
|
tree
2014-06-12
J
u
nio C
Hama
n
o
Mer
g
e bran
c
h 'jc/rev-parse-argh-
d
ashed-multi-words
.
.
.
commit
|
commitdiff
|
tree
2014-06-12
Jacek Koniec
z
ny
pull: do not abuse 'break
'
inside a sh
e
ll
'ca
s
e'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-09
Juni
o
C Hama
n
o
revision
:
parse "git log -<cou
n
t>"
m
ore carefull
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-04
Jeff King
update-i
n
de
x
: fix segfault with
m
issing
--cacheinfo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-02
René Scha
r
fe
pack-objects: use fre
e
()+x
c
allo
c
()
i
n
s
te
a
d of xrealloc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-02
R
ené Scharfe
mailinfo: use strcmp()
f
or string com
p
arison
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-02
Mich
a
el
Naumov
si
d
eband
.
c
: do
n
o
t
u
s
e
ANSI control sequ
e
nce
o
n non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-30
J
unio C Hamano
Sync with 1
.
9
.
4
commit
|
commitdiff
|
tree
2014-05-30
Ju
n
io C Hama
n
o
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
-
dr
o
p htt
p
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-28
Junio C Hamano
Merge branch 'rh/prompt-pcmode
-
av
o
i
d-e
v
a
l
-
o
n-refname
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Junio C Hamano
M
erge branc
h
'mw/sy
m
li
n
k
s' into mai
n
t
commit
|
commitdiff
|
tree
2014-05-28
Junio C Hamano
Git 2
.
0
commit
|
commitdiff
|
tree
2014-05-27
Øyste
i
n
W
alle
c
onfig: respect '~'
an
d
'
~
u
s
er' in mailmap
.
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-27
N
g
u
y
ễn Thái
N
gọc Duy
g
c
--auto: d
o
not lock refs in the background
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
co
m
pletion: add
m
issing options
fo
r
git-m
e
rge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
compl
e
tion: add a note that merge op
t
io
n
s are
shared
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
Junio
C Hamano
Up
d
ate draft release notes
t
o 2
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
Al
e
xey Shum
k
in
pretty
.
c: for
m
at
string with truncate respects logOutputEncoding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
Ale
x
ey
S
h
u
mk
i
n
t4
2
05, t6006: add tests that f
a
il with i18
n
.
logOutputEncodin
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
Alexey Shumkin
t4205 (log-pretty-format): use `tformat` ra
t
her
than
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
Alexey
S
humkin
t4041, t
4
205, t6
0
0
6,
t
7102: don't hardcode test
e
d encoding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
J
unio C Hamano
G
i
t 2
.
0-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Jason
S
t
.
John
RelN
o
tes/2
.
0
.
0
.
txt: Fix
s
everal gr
a
mmar issue
s
, nota
b
ly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Junio C Hamano
Rever
t
"
Merge
b
ranch 'j
c
/graduate-remote-hg-
b
zr' (ea
r
ly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Jeff King
move "--follow n
e
eds on
e
pat
h
s
p
ec" rule t
o
diff_set
u
p_done
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Junio
C
Hamano
Mer
g
e branch 'jc/graduate-re
m
ote-hg-bzr' (early
part)
commit
|
commitdiff
|
tree
2014-05-20
Junio C Ha
m
ano
remote-he
l
pers: p
o
int
at their
u
p
s
t
r
eam reposit
o
ries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Felipe Co
n
t
r
eras
con
t
ri
b
: remote-
h
elpers:
add mo
v
e warnings
(
v2
.
0)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Junio C Ham
a
no
Revert "
M
erge branch 'fc/tra
n
sp
o
rt-h
e
l
p
er
-
s
ync-error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
Jun
i
o C Hamano
Merge branch '
r
h/prompt-
p
cmod
e
-a
v
oi
d
-eval-on-refname'
commit
|
commitdiff
|
tree
2014-05-19
Richard H
a
nsen
git-pr
o
mpt
.
s
h
:
don't a
s
su
m
e th
e
shell expands the value
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
Alexey Shumkin
t420
5
(l
o
g-pretty-for
m
ats
)
:
d
on't
hardcode SHA-1 in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
Junio C Hamano
Merge
bran
c
h 'lt/
r
e
quest-pull'
commit
|
commitdiff
|
tree
2014-05-19
Jun
i
o
C Ha
m
ano
Mer
g
e b
r
anch 'jl/use-vsat
i
sf
y
-correctly-for-2
.
0
'
commit
|
commitdiff
|
tree
2014-05-19
Junio C Haman
o
Merge git
:
/
/github
.
com/git-l10n/git
-
po
commit
|
commitdiff
|
tree
2014-05-19
J
u
nio C H
a
mano
M
e
rge branch 'kb/fast-hashm
a
p'
commit
|
commitdiff
|
tree
2014-05-19
A
nder
s
K
a
se
o
rg
Docume
n
t
a
t
i
on/technical/api-h
a
s
h
m
a
p: remov
e
source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
J
e
ns
Lehmann
git-gui: tolerate
major version changes
when com
p
ari
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-16
Jun
i
o C Hamano
request-p
u
ll:
r
esurrect fo
r
-linus -> tags/for-linus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-15
J
o
hann
e
s
S
chi
n
d
elin
git grep -O -i: i
f
the pager is 'less', pass the
'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-15
Jeff King
op
e
n_sha1
_
file:
r
ep
o
rt "m
o
st interesting" er
r
no
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-15
Jeff King
run_diff_files
:
do
not look at unini
t
iali
z
ed stat data
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-13
Ju
n
io C Hamano
Merg
e
br
a
nch 'fc/prompt-zsh-read-fr
o
m
-file'
commit
|
commitdiff
|
tree
2014-05-13
Felipe
Contrera
s
co
n
trib: compl
e
tion: fix 'eread
(
)' namespace
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-12
Je
f
f
K
ing
index-pack
:
d
istingui
s
h missing objects fr
o
m
t
ype er
r
or
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-12
Junio C Hama
n
o
Mer
g
e
g
it://githu
b
.
com/git-l1
0
n/gi
t
-po
commit
|
commitdiff
|
tree
2014-05-09
Junio C Ham
a
n
o
Git 2
.
0
-
rc3
commit
|
commitdiff
|
tree
2014-05-09
Junio C Hamano
Sync
w
ith 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
brian m
.
carls
o
n
blame: correctly
handl
e
files regardless of autocrlf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Davi
d
Tur
n
er
mv: allow ren
a
ming
t
o fix case on
c
ase insensitive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
J
unio
C Ha
m
ano
S
ync with maint
commit
|
commitdiff
|
tree
2014-05-08
Jonatha
n
Nieder
sh
e
ll doc: remove stray
"+" in exa
m
ple
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Ju
n
io C Hamano
Merge
g
it://github
.
com/git-
l
10n/git-po
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
S
tar
t
preparing for 1
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
J
unio C Hamano
Merge branch 'cl/p4-
u
s
e-diff-tree'
into maint
commit
|
commitdiff
|
tree
2014-05-08
Junio C
H
amano
Merge
branch 'rh/prompt-pcmode
-
a
v
o
id
-
eval-on-
r
efname
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Ju
n
io C Haman
o
Mer
g
e branch 'km/a
v
o
id-non
-
func
t
i
o
n-return-in-rebase
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Junio C H
a
mano
Merge branch 'tb/un
i
code-6
.
3
-
zero-wid
t
h' into maint
commit
|
commitdiff
|
tree
2014-05-08
J
u
nio C Hamano
Merge b
r
anch '
k
m/avoid-bs-in-shell-gl
o
b' into
maint
commit
|
commitdiff
|
tree
2014-05-08
J
u
nio C Ha
m
ano
Merg
e
branch 'km/avoid-cp-a' into
ma
i
nt
commit
|
commitdiff
|
tree
2014-05-07
J
u
nio C Hamano
Updat
e
draft r
e
leas
e
note
s
for 2
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-07
Junio C Ha
m
ano
Merge branc
h
'
cl/p4
-
use-diff-tree'
commit
|
commitdiff
|
tree
2014-05-07
D
a
vid Tur
n
e
r
merge-rec
u
rsive
.
c: fix case-changing merge bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-07
Tolga Ceylan
gi
t
-p4: format-patc
h
to di
f
f
-tree change breaks binary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-07
Øyvind A
.
Holm
RelNotes/2
.
0
.
0: Gramma
r
a
n
d typo fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-02
Junio C Hama
n
o
Git 2
.
0-rc2
commit
|
commitdiff
|
tree
2014-05-02
Junio C Haman
o
Merge branch 'mw/symlink
s
'
commit
|
commitdiff
|
tree
2014-05-02
Junio C Ham
a
no
Merge
b
ranch 'km/
g
i
t
-svn-w
o
r
karoun
d
-old
e
r-g
e
t
o
pt-long'
commit
|
commitdiff
|
tree
2014-05-02
Junio C Hamano
Merge
branch 'rh/prompt-pcmode-avoi
d
-eval-on-re
f
name'
commit
|
commitdiff
|
tree
2014-05-02
Junio C
H
ama
n
o
Merge bra
n
ch 'mk/d
o
c-git-gui
-
dis
p
l
ay-untracked'
commit
|
commitdiff
|
tree
2014-04-30
Junio C Ham
a
no
Merge
gi
t
:
/
/
github
.
com/g
i
t
-l10n/git-po
commit
|
commitdiff
|
tree
2014-04-30
Jun
i
o C H
a
m
a
no
Revert
t
h
e
whole
"ask curl
-
config" topic for
now
commit
|
commitdiff
|
tree
2014-04-30
Felipe
Con
t
reras
r
e
r
ere:
fix for merg
e
.
conflic
t
style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-28
Jörn Engel
pager: do allow spa
w
ning
p
ager recursively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-28
Junio
C
Hamano
M
e
rge bra
n
ch 'd
b
/make-with-curl'
commit
|
commitdiff
|
tree
2014-04-28
Ju
n
io C Hamano
Merg
e
branch
'jk/extern
a
l-diff
-
use-argv-array' (early
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Dav
e
Borowitz
Mak
e
file: default to -lcurl whe
n
no CURL_CO
N
FIG
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next