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 Hamano
Merge br
a
nc
h
'fc/re
r
ere-conflict-style
'
into maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Ha
m
ano
M
erge branch 'rs/pack-objects-n
o
-un
n
ece
s
sar
y
-realloc
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C
H
amano
Merge branch 'dt/merg
e
-recur
s
ive-case-insen
s
itive'
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Juni
o
C
Haman
o
Mer
g
e branch 'rs/mail
i
nfo-header-cmp'
i
nto maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge
b
ranch
'
jk/index-pack
-
report-missing' into maint
commit
|
commitdiff
|
tree
2014-06-25
Jun
i
o C
H
amano
M
erge b
r
anch 'nd/index-pack-one-
f
d
-per-thread' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Ham
a
n
o
M
e
r
ge branch 'sk/spawn-less-case-insensitively-from
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merg
e
branch 'nd/da
e
m
o
nize
-
gc' into
maint
commit
|
commitdiff
|
tree
2014-06-25
J
u
n
io C Hama
n
o
Merge br
a
n
c
h 'jk/diff-follow-must-
t
ake-one-pa
t
hspec
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Haman
o
Me
r
ge
bran
c
h 'jk/
d
i
f
f
-files-a
s
su
m
e-unchanged' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio
C
Hamano
Me
r
g
e
branch 'jk/com
m
it-C-p
i
ck-empty' into m
a
int
commit
|
commitdiff
|
tree
2014-06-25
Juni
o
C Haman
o
Me
r
ge bran
c
h
'bc/blame-
c
rlf-test'
into maint
commit
|
commitdiff
|
tree
2014-06-25
J
u
nio C
H
ama
n
o
Merge bra
n
ch 'jx/blam
e
-align-
r
elative-tim
e
' int
o
m
aint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Me
r
g
e
bra
n
c
h
'
j
c/apply-ignore
-
whitespace' into maint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge branc
h
'jk/complete
-
merg
e
-
p
ull' into main
t
commit
|
commitdiff
|
tree
2014-06-25
Ju
n
io C Haman
o
Merge br
a
n
ch 'ow
/
config-mail
m
ap-pathname' into maint
commit
|
commitdiff
|
tree
2014-06-25
Junio
C
H
a
man
o
Merge branch '
a
s/pretty-trunca
t
e'
into mai
n
t
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Merge b
r
anch
'
jc/re
v
ision-dash-coun
t
-
p
arsing' into
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C Ha
m
a
n
o
Me
r
ge branch 'jk
/
rep
o
rt-f
a
il-to-rea
d
-objects-be
t
ter
.
.
.
commit
|
commitdiff
|
tree
2014-06-25
Junio C
H
amano
M
e
rge bra
n
ch 'm
n
/
sideband-
n
o
-
ansi'
into
m
aint
commit
|
commitdiff
|
tree
2014-06-25
Junio C Hamano
Mer
g
e
branch
'
j
e
/p
a
ger-do-no
t
-r
e
curse' into maint
commit
|
commitdiff
|
tree
2014-06-12
Junio C Hama
n
o
Merge branch 'jc/r
e
v-pa
r
se-ar
g
h
-
dashed-multi-wor
d
s
.
.
.
commit
|
commitdiff
|
tree
2014-06-12
J
acek Konie
c
zny
pull: do not ab
u
se 'break' inside a shell 'case'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-09
Junio C Hamano
revisio
n
:
par
s
e "
g
it lo
g
-<
c
ount>" m
o
r
e
carefully
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-04
J
e
f
f
King
update-index
:
fix s
e
gfa
u
lt
w
ith mi
s
sing
-
-cacheinfo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-02
René
Scharfe
pack-objects: use
f
re
e
()+xcalloc() instead of xreal
l
oc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-02
R
e
né Schar
f
e
mailinfo: use strc
m
p()
for s
t
ring compari
s
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-06-02
Mic
h
ael Naumov
sid
e
ba
n
d
.
c: do not u
s
e A
N
SI control se
q
uence on
non
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-30
Junio C H
a
mano
Sync wit
h
1
.
9
.
4
commit
|
commitdiff
|
tree
2014-05-30
Junio C Haman
o
Git
1
.
9
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-30
J
e
ff King
t5537: re-drop htt
p
test
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-28
Jun
i
o
C
Ham
a
no
Merg
e
branc
h
'r
h
/p
r
ompt-pcmode
-
avoid-
e
val-
o
n-re
f
name
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Junio C Hamano
Merge branc
h
'mw/symlinks' into mai
n
t
commit
|
commitdiff
|
tree
2014-05-28
Junio C Haman
o
Git 2
.
0
commit
|
commitdiff
|
tree
2014-05-27
Øystein Walle
config: respect '~'
a
n
d
'
~
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
g
c
--auto: do
n
ot
l
o
ck refs
i
n the
b
ackground
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-27
John Keepi
n
g
completion: add missing op
t
i
o
ns for git-merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-27
John Keeping
completion: a
d
d a not
e
that
m
erg
e
options a
r
e shared
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Jun
i
o C
Haman
o
Up
d
at
e
dra
f
t release
notes to 2
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Al
e
xey Shumkin
pretty
.
c: format stri
n
g
with
tru
n
c
a
te re
s
pects logOutputEnco
d
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Ale
x
ey Shumkin
t4205, t
6
006: add tests that fail with i18
n
.
logOutputEncod
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Al
e
x
e
y Shumki
n
t4205 (l
o
g-
p
retty
-
format): use
`tformat`
r
a
ther
than
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-21
Alex
e
y
Sh
u
mkin
t
40
4
1, t42
0
5, t
6
006, t7102:
don't har
d
code tested encodin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
J
u
nio C Hamano
Git 2
.
0-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Jason St
.
Joh
n
RelNotes/2
.
0
.
0
.
txt:
F
i
x several gramm
a
r issue
s
,
n
o
tably
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
J
u
ni
o
C H
a
ma
n
o
Revert
"
Merge branch
'
jc/
g
raduate-remote-hg-bzr'
(
e
arly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Jeff
King
move
"
--follow n
e
eds one pa
t
hspec" rule to
d
i
f
f_se
t
up_do
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Junio C Hama
n
o
Merge bran
c
h 'jc/gra
d
uate-remote
-
hg-bzr' (ear
l
y part)
commit
|
commitdiff
|
tree
2014-05-20
Junio C
Hamano
remot
e
-
helpers: poin
t
at
t
heir upstre
a
m
repositories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-20
Fel
i
pe Contreras
c
o
ntrib: remot
e
-he
l
pers:
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
Re
v
er
t
"Merge bran
c
h 'fc/trans
p
ort
-
helper-s
y
nc-error
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
Junio C
Hamano
M
erge b
r
anch 'rh/prompt-pcmode-avoid-
e
val-o
n
-refname'
commit
|
commitdiff
|
tree
2014-05-19
Ric
h
a
r
d
Hansen
git-pr
o
mpt
.
sh: don't assume
the shell expands t
h
e value
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
Al
e
x
e
y
S
humkin
t42
0
5
(
lo
g
-pret
t
y-fo
r
ma
t
s): d
o
n't hardcod
e
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/reque
s
t
-
pu
l
l'
commit
|
commitdiff
|
tree
2014-05-19
J
u
nio
C Hamano
Me
r
ge bran
c
h 'jl/use-vsatisfy-c
o
rrectly-for-2
.
0
'
commit
|
commitdiff
|
tree
2014-05-19
Junio
C
Hamano
Merge git:
/
/github
.
c
om/git-l10n/git-po
commit
|
commitdiff
|
tree
2014-05-19
Ju
n
i
o
C Haman
o
Merge branch 'kb/fast-has
h
map'
commit
|
commitdiff
|
tree
2014-05-19
Anders Kaseor
g
D
o
cum
e
nta
t
ion/technical/api-h
a
shmap
:
r
e
m
o
v
e source
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-19
J
ens Lehmann
gi
t
-gui
:
t
o
ler
a
te majo
r
versi
o
n
changes when
c
omparing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-16
Junio C Ham
a
no
reques
t
-pul
l
: resurrect for-linus -> t
a
gs/fo
r
-lin
u
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-15
Johannes Schindelin
git
gr
e
p -O
-
i
: if t
h
e pa
g
er i
s
'les
s
', pass the '
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-15
J
ef
f
K
i
ng
open_sha1_file: r
e
port "m
o
st i
n
ter
e
sting" errno
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-15
Jeff
K
ing
run_diff_files: do not
l
ook at
u
n
initialized sta
t
data
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-13
Junio C H
a
m
a
no
Merge
b
r
anch 'f
c
/prompt-zsh-read-from-file'
commit
|
commitdiff
|
tree
2014-05-13
F
elipe C
o
ntre
r
as
contrib: completion: f
i
x 'eread()' namespace
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-12
Jeff King
i
n
dex-pack: dist
i
nguish mi
s
sing objects
from type er
r
ors
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-12
Ju
n
io C Hamano
Merge git:/
/
gith
u
b
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2014-05-09
Junio C Hamano
Git 2
.
0-
r
c3
commit
|
commitdiff
|
tree
2014-05-09
Junio C Hamano
Sync
with 1
.
9
.
3
commit
|
commitdiff
|
tree
2014-05-09
Junio C Hama
n
o
G
i
t 1
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
brian
m
.
carlso
n
blame: correc
t
l
y handle files
regardless of a
u
tocrlf
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
D
avid Turner
mv: a
l
low r
e
naming
to fi
x
case on c
a
se insensitive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
J
u
nio C Ha
m
ano
Sync with maint
commit
|
commitdiff
|
tree
2014-05-08
J
o
nathan Nieder
shell
d
oc: remo
v
e stray "+" in example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
Ju
n
i
o
C Hamano
Merge git://githu
b
.
com/git-l10n/
g
it-p
o
commit
|
commitdiff
|
tree
2014-05-08
Junio
C
Hamano
Start preparing
for 1
.
9
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Mer
g
e branch 'cl/p4-use-diff-tree' into maint
commit
|
commitdiff
|
tree
2014-05-08
Junio C H
a
mano
Me
r
ge bran
c
h 'rh/
p
rompt
-
p
c
mode-avoid-eval-on-refname
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Merge branch
'
km/
a
v
o
id-non-function-re
t
u
r
n-in-re
b
ase
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Junio C
H
aman
o
Merge branch '
t
b/u
n
icode-6
.
3-zero-width
'
into
mai
n
t
commit
|
commitdiff
|
tree
2014-05-08
J
u
nio C Hamano
M
e
rge bran
c
h 'km/avoid-
b
s-in-she
l
l-glob' into maint
commit
|
commitdiff
|
tree
2014-05-08
Junio C Ham
a
no
Merge branch 'km/avoid-cp-a' int
o
maint
commit
|
commitdiff
|
tree
2014-05-07
J
u
nio C Hamano
Upd
a
te draft
release notes for 2
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-07
Junio C Ha
m
ano
Merge
bra
n
ch
'cl/p
4
-use-di
f
f-tree'
commit
|
commitdiff
|
tree
2014-05-07
Davi
d
Tu
r
n
e
r
me
r
g
e
-recursive
.
c
: fi
x
cas
e
-
chan
g
i
n
g merge bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-07
Tolga Ceylan
git-p4: f
o
rmat
-
patch to
d
iff-tree
c
ha
n
ge breaks
binary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-07
Øyvi
n
d A
.
Holm
R
elNotes/
2
.
0
.
0: G
r
amm
a
r
a
nd typo fixe
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-05-02
Junio
C
Hama
n
o
Git 2
.
0-
r
c2
commit
|
commitdiff
|
tree
2014-05-02
J
unio C
H
amano
Merge branch 'mw/symlinks'
commit
|
commitdiff
|
tree
2014-05-02
Junio C
Hamano
M
erge b
r
an
c
h 'k
m
/gi
t
-svn-workaround-older-getop
t
-l
o
ng'
commit
|
commitdiff
|
tree
2014-05-02
Junio
C Hamano
Mer
g
e
branch 'rh/
p
r
o
mpt-pcmode-avoid
-
eva
l
-o
n
-refname'
commit
|
commitdiff
|
tree
2014-05-02
Junio
C Ham
a
no
Mer
g
e
b
ranch
'mk/doc
-
g
it-gui
-
di
s
play
-
u
n
tracked'
commit
|
commitdiff
|
tree
2014-04-30
Junio
C
Hamano
Merge gi
t
://github
.
com/g
i
t-l10n/
g
it-po
commit
|
commitdiff
|
tree
2014-04-30
Junio C Ha
m
a
no
Re
v
e
r
t
the who
l
e "ask cu
r
l-co
n
fig" topic for now
commit
|
commitdiff
|
tree
2014-04-30
F
elipe
Contr
e
ras
r
e
rere: f
i
x for merge
.
conflict
s
tyle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-28
Jörn Engel
p
ager
:
do allow spa
w
n
i
ng
p
ager recursively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2014-04-28
Junio C H
a
m
ano
Merge
branch 'db/make-wi
t
h
-
curl'
commit
|
commitdiff
|
tree
2014-04-28
J
unio C Hamano
Me
r
ge br
a
nch
'jk/external-dif
f
-us
e
-
argv-array' (ear
l
y
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Dave Boro
w
itz
Makefi
l
e: default t
o
-lcurl whe
n
no
CURL_CONFIG or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next