repo.or.cz
/
git.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
J
unio C Ha
m
ano
Merge branc
h
'fc/rerere-conf
l
i
ct-style' into m
a
int
commit
|
commitdiff
|
tree
2014-06-25
J
unio C Hamano
M
erge br
a
n
c
h 'rs/pack-objects-no-unnecessary-realloc
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge b
r
anch 'dt/merge-recursi
v
e
-case-insensitive'
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
J
unio C Hamano
Merge bra
n
ch 'rs/mailinfo-header-cmp' into
m
aint
commit
|
commitdiff
|
tree
2014-06-25
Jun
i
o C Hama
n
o
Merge b
r
anch 'jk/in
d
ex-pack-
r
e
p
o
r
t-missi
n
g' into maint
commit
|
commitdiff
|
tree
2014-06-25
Juni
o
C Ha
m
ano
M
erge branc
h
'nd/ind
e
x-pac
k
-one-fd-per-thre
a
d' int
o
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Juni
o
C
Hamano
Merge branch
'
sk/spawn
-
les
s
-case-in
s
ensitively-fro
m
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
J
unio C
H
amano
Merge branch 'nd/daemoni
z
e-gc' into
m
aint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge branch 'jk/diff-f
o
llow-must
-
t
a
k
e
-one-pathspec
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Ham
a
no
Merge branch '
j
k/diff-files-a
s
s
u
m
e-unchan
g
ed' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio
C
Hamano
Me
r
ge
bra
n
c
h
'jk/co
m
mit
-
C-pi
c
k-empty' into maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C
Hamano
Merge branch 'bc/blame-crlf-test' into maint
commit
|
commitdiff
|
tree
2014-06-25
Jun
i
o C
H
am
a
no
Mer
g
e branch 'jx/bl
a
me-align-relative-time' into maint
commit
|
commitdiff
|
tree
2014-06-25
Juni
o
C Ha
m
ano
M
e
rge branch 'jc/apply-ignore-whitespace' i
n
to maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Haman
o
Merge bra
n
ch
'
j
k/complete-merge-pu
l
l' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2014-06-25
Junio C Haman
o
Merge branch 'ow/config-mailmap-p
a
thname' into
maint
commit
|
commitdiff
|
tree
2014-06-25
Ju
n
io C H
a
ma
n
o
Me
r
ge branch
'
as
/
pretty-truncate' into
m
ain
t
commit
|
commitdiff
|
tree
2014-06-25
J
u
ni
o
C
Hamano
Merge branch
'jc/re
v
ision-d
a
sh-count-parsing'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio
C
Ha
m
ano
Merge branch 'jk/
r
epo
r
t-fail-to-re
a
d
-objects-better
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Ju
n
io C Hamano
Merge branch
'
m
n
/sideband-no-ansi'
into maint
commit
|
commitdiff
|
tree
2014-06-25
J
unio C
H
a
m
ano
Merge b
r
a
nch '
j
e
/
pager-do-not-recur
s
e' into ma
i
n
t
commit
|
commitdiff
|
tree
2014-06-12
Ju
n
io C Ha
m
ano
Merg
e
branch
'
j
c/
r
ev-parse-argh-da
s
hed-mul
t
i-words
.
.
.
commit
|
commitdiff
|
tree
2014-06-12
Jacek Ko
n
ieczny
pull: do
no
t
abuse 'brea
k
' inside a sh
e
ll 'case'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-09
J
u
nio C
Hamano
revision: parse
"git
l
og -<count>" more carefully
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-04
Jeff King
up
d
ate-index
:
fix segfault with missing -
-
cac
h
einf
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-02
R
e
né
S
charfe
pack-objects: use fre
e
()+xcalloc() instead of
xr
e
alloc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-02
René Sc
h
arfe
mailinfo: use strcmp()
f
or string co
m
par
i
son
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-06-02
Michael N
a
umov
sideba
n
d
.
c: do not use ANS
I
control
sequence
o
n
non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-30
Junio C Haman
o
Sync
with 1
.
9
.
4
commit
|
commitdiff
|
tree
2014-05-30
Junio C
Hamano
Git 1
.
9
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-30
Jeff Ki
n
g
t
55
3
7: re-drop http tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-28
Junio C Ham
a
no
Merg
e
branch '
r
h/prompt-pcmode-avoid-ev
a
l-on-refna
m
e
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Jun
i
o C Hamano
Merge branch
'
mw/
s
yml
i
n
ks' in
t
o maint
commit
|
commitdiff
|
tree
2014-05-28
Ju
n
io C Hamano
G
i
t
2
.
0
commit
|
commitdiff
|
tree
2014-05-27
Øyst
e
in
Walle
config:
r
espect
'
~' a
n
d '~
u
s
er' in mailmap
.
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-27
Nguyễn T
h
ái Ngọc
D
uy
gc --a
u
to:
d
o
n
o
t lock ref
s
in the back
g
round
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-27
John Keepin
g
completio
n
: add m
i
s
s
ing
o
pt
i
ons for
git-m
e
rge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
co
m
pleti
o
n
: add
a
note tha
t
m
e
r
g
e
options
a
r
e sha
r
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
Junio C Ham
a
n
o
Update draft release notes to 2
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
Alexey Shumkin
pretty
.
c
: format s
t
ring with tr
u
ncate respects
l
o
g
Outpu
t
Encodin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
Alexey Shumkin
t4
2
0
5,
t
6006: add tests tha
t
f
a
il wit
h
i18
n
.
logOutput
E
nco
d
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
A
lexey Sh
u
m
kin
t
4
2
05 (log-prett
y
-format
)
: use `tfor
m
at` rather th
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-21
Ale
x
ey Shumkin
t40
4
1, t420
5
,
t600
6
, t7
1
02: don't hardc
o
de
tested enc
o
ding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Junio C H
a
mano
Git 2
.
0-r
c
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Jason St
.
John
R
elNotes
/
2
.
0
.
0
.
txt: Fix several grammar issu
e
s, notably
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Junio C Hamano
R
e
vert "Merge branch 'jc/gr
a
duate-remote-hg
-
bzr' (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
o
ne pathspec" rule to diff_s
e
tup
_
do
n
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
J
unio C Ha
m
ano
Merge br
a
nch 'jc/g
r
aduate-remote-hg-
b
z
r
'
(e
a
r
l
y part)
commit
|
commitdiff
|
tree
2014-05-20
Junio C Hama
n
o
rem
o
te
-
helpers: po
i
nt at t
h
ei
r
u
pstream repositories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Felipe Co
n
treras
contrib: remote-helpers:
a
dd m
o
ve warnings (v2
.
0
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
J
u
nio C
H
amano
Rev
e
rt "M
e
rge branc
h
'fc
/
tra
n
sp
o
rt
-
helper-syn
c
-error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
Jun
i
o C Ham
a
no
Merge br
a
nch 'rh/prompt-pc
m
ode
-
avoid-ev
a
l-on-re
f
name'
commit
|
commitdiff
|
tree
2014-05-19
R
i
chard Hans
e
n
git-
p
rom
p
t
.
sh: don't ass
u
me
t
he shell ex
p
ands the value
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
Alexe
y
Sh
u
mkin
t
4
205 (log-pre
t
ty-formats): do
n
't hardcode SHA-1 in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
Junio C Hamano
Merge br
a
nch 'lt
/
r
e
quest-pull'
commit
|
commitdiff
|
tree
2014-05-19
Junio C Hamano
Merge bra
n
ch 'jl/use-vsatisfy-
c
o
r
rectly-fo
r
-2
.
0
'
commit
|
commitdiff
|
tree
2014-05-19
Ju
n
io C Hamano
Mer
g
e
g
it://
g
ithub
.
com/
g
it-l10n/git-po
commit
|
commitdiff
|
tree
2014-05-19
Junio
C
Hamano
Merge b
r
anch
'kb/fast-hashm
a
p'
commit
|
commitdiff
|
tree
2014-05-19
Anders Kaseorg
Doc
u
mentation/technical/api-has
h
map: remove source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
J
e
ns Lehm
a
nn
git-gui: tole
r
ate ma
j
or vers
i
on chang
e
s wh
e
n
comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-16
Junio C
H
amano
request-
p
ull: resurrect f
o
r-linus -> tags/f
o
r-lin
u
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-15
Johann
e
s Schind
e
lin
git grep -O -i: if the pager is 'less', pass t
h
e
'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-15
Jeff King
open_sha
1
_file:
r
e
p
ort "mos
t
i
nteresting" errno
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-15
Jeff
K
ing
run
_
d
iff_files: do
n
ot look
at
u
ninitiali
z
ed stat
d
ata
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-13
Junio C Hamano
Merge
b
ranch
'
f
c
/prompt-zsh-read-from
-
file
'
commit
|
commitdiff
|
tree
2014-05-13
Feli
p
e Con
t
reras
contrib: co
m
pletion: fix 'eread()
'
n
a
mespace
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-12
Jef
f
King
i
ndex-pack: disti
n
guis
h
m
is
s
ing objects fr
o
m type erro
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-12
J
u
ni
o
C Hamano
Merg
e
git://github
.
co
m
/git-
l
10n/git-po
commit
|
commitdiff
|
tree
2014-05-09
Junio C Hama
n
o
Git 2
.
0-
r
c
3
commit
|
commitdiff
|
tree
2014-05-09
J
u
nio
C Ham
a
no
S
y
n
c
with 1
.
9
.
3
commit
|
commitdiff
|
tree
2014-05-09
J
un
i
o C Hamano
Git 1
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
brian m
.
carlson
blame: correctly
handle files regardless of autocrlf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Dav
i
d Turner
mv: allow r
e
n
ami
n
g to fix case on case i
n
s
e
nsitive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Junio
C
Hamano
S
y
nc wit
h
maint
commit
|
commitdiff
|
tree
2014-05-08
Jonathan Nieder
shell d
o
c: remove
stray "+" in example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Ju
n
io
C
Hamano
Mer
g
e gi
t
://github
.
com/git-l10
n
/git
-
po
commit
|
commitdiff
|
tree
2014-05-08
J
unio C
Ha
m
an
o
Start
p
reparing for
1
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Ju
n
io C Hamano
Merge branch 'c
l
/p4-use-dif
f
-tree' into m
a
int
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hama
n
o
Merge branch 'rh/prompt-
p
cmode-avo
i
d-eval-on-refn
a
me
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Junio C
H
amano
M
e
r
ge branch '
k
m/avoid-
n
on-func
t
ion-return-in-rebase
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Junio C Haman
o
Merge bran
c
h 'tb/un
i
code-6
.
3-zero-width' into maint
commit
|
commitdiff
|
tree
2014-05-08
Jun
i
o C Hamano
Merge
br
a
n
c
h 'km/a
v
oid-bs-in-sh
e
ll
-
glob'
i
nto
maint
commit
|
commitdiff
|
tree
2014-05-08
Juni
o
C
H
a
m
a
no
Merge
b
ran
c
h
'km/avoid-cp-a' into maint
commit
|
commitdiff
|
tree
2014-05-07
J
unio C Ha
m
ano
Up
d
ate dra
f
t release notes fo
r
2
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-07
J
unio C Hama
n
o
Merge bra
n
ch
'
c
l/p4-u
s
e
-diff-tree'
commit
|
commitdiff
|
tree
2014-05-07
Da
v
id
T
u
r
ner
merge-recursive
.
c: fix
case-cha
n
ging merge bu
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-07
T
o
lga Ceylan
git-p4: form
a
t-patch to diff-tree change breaks bin
a
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-07
Øy
v
ind
A
.
H
o
lm
R
e
lNot
e
s/2
.
0
.
0: Gra
m
mar an
d
typ
o
fixe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-02
Ju
n
io C Hamano
Git 2
.
0-rc
2
commit
|
commitdiff
|
tree
2014-05-02
Junio C
H
a
mano
Merge branch 'mw/sy
m
links'
commit
|
commitdiff
|
tree
2014-05-02
Juni
o
C Hamano
Merge b
r
a
n
ch '
k
m/gi
t
-
s
vn-work
a
round-older-getop
t
-lo
n
g
'
commit
|
commitdiff
|
tree
2014-05-02
Juni
o
C Ham
a
no
Merge branch '
r
h/promp
t
-pcmode
-
avoid-
e
val-on-
r
efnam
e
'
commit
|
commitdiff
|
tree
2014-05-02
Juni
o
C H
a
mano
M
e
rge
b
ranc
h
'mk
/
do
c
-git-gu
i
-display-untracked'
commit
|
commitdiff
|
tree
2014-04-30
Junio C Ham
a
no
Merge
git:
/
/github
.
c
om/git-l10n/git-po
commit
|
commitdiff
|
tree
2014-04-30
J
unio C Hamano
Revert the who
l
e "a
s
k curl-config" t
o
pic for n
o
w
commit
|
commitdiff
|
tree
2014-04-30
Felipe Contrera
s
rere
r
e: f
i
x for
m
erge
.
c
onflictst
y
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-28
Jörn Engel
pager: do
allow spa
w
ning pager recur
s
ively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-28
Junio C Hamano
Me
r
g
e
bran
c
h 'd
b
/make-with-curl'
commit
|
commitdiff
|
tree
2014-04-28
J
unio
C
Hama
n
o
Mer
g
e branch '
j
k
/
external-d
i
f
f
-use-ar
g
v-array' (ea
r
ly
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Da
v
e
B
o
rowitz
Makefile: default to -l
c
u
rl when no CURL
_
C
O
NFI
G
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next