repo.or.cz
/
git
/
git-svn.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'
2014-06-03
Junio C Hamano
Merge branch 'fc/rer
e
re-conflict-st
y
le
'
commit
|
commitdiff
|
tree
2014-06-03
J
u
nio C Ha
m
a
no
Merge
branch '
d
t/api-d
o
c-se
t
up-g
e
ntly'
commit
|
commitdiff
|
tree
2014-06-03
Juni
o
C Hamano
Me
r
ge branch '
f
c/mergetool-prompt'
commit
|
commitdiff
|
tree
2014-06-03
J
unio C Haman
o
Merge bran
c
h 'mm/mediawiki-enc
o
din
g
-fix'
commit
|
commitdiff
|
tree
2014-06-03
Junio C Hamano
Merge branch 'sk/ta
g
-contains-wo-recursion'
commit
|
commitdiff
|
tree
2014-06-03
Junio
C
H
amano
Merge branch
'ef
/
send-
e
mail-absolu
t
e-pat
h
-to-th
e
-comma
n
d'
commit
|
commitdiff
|
tree
2014-06-03
Junio
C
Hamano
Merge branch 'jx/blame-align-rel
a
tive
-
t
i
me'
commit
|
commitdiff
|
tree
2014-06-03
Junio
C
Ha
m
ano
Merge
b
r
anch
'
lr
/
g
i
t-run-se
t
up
-
gently'
commit
|
commitdiff
|
tree
2014-06-03
Junio C H
a
mano
M
e
rge
b
ranch 'fc/mergetools-
v
imdiff3'
commit
|
commitdiff
|
tree
2014-06-03
Junio
C
Hamano
M
e
rge br
a
nch 'fc/merge-defaul
t
-to-u
p
str
e
am'
commit
|
commitdiff
|
tree
2014-06-03
Junio C Hamano
M
e
r
g
e bran
c
h
'
jk
/
external-diff-use-argv-array'
commit
|
commitdiff
|
tree
2014-06-03
Ju
n
io C Ha
m
an
o
Mer
g
e bran
c
h 'sk/sv
n
-parse-d
a
tes
t
amp'
commit
|
commitdiff
|
tree
2014-06-03
Junio
C Hamano
Merge b
r
anc
h
'rs/ref-update-check-errors-early'
commit
|
commitdiff
|
tree
2014-06-03
J
u
nio
C Ham
a
no
Merge
br
a
nch 'nd/
i
ndex-pack-one
-
fd-per-thre
a
d'
commit
|
commitdiff
|
tree
2014-06-03
J
unio C Hamano
M
e
rge
branch 'ym/fix-opportunis
t
ic-index-u
p
d
ate
-
ra
c
e'
commit
|
commitdiff
|
tree
2014-06-03
J
un
i
o C H
a
man
o
Me
r
ge branch 'm
h
/ref-tra
n
sac
t
ion'
commit
|
commitdiff
|
tree
2014-06-03
Junio C Hamano
M
erge branch 'ks/tree-
d
iff-nw
a
y'
commit
|
commitdiff
|
tree
2014-06-03
Junio C
H
amano
Merge branch
'jc/apply-i
g
nore-wh
i
tespace'
commit
|
commitdiff
|
tree
2014-06-03
Junio
C
H
amano
Merge branch 'as/
g
rep-fullname-co
n
fig'
commit
|
commitdiff
|
tree
2014-05-30
Jun
i
o C Hamano
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 King
t
5
537: re-drop http tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-28
J
uni
o
C
H
am
a
no
M
e
rge branch
'
rh/pr
o
mpt-
p
c
mode-avoid-eval-o
n
-refname
.
.
.
commit
|
commitdiff
|
tree
2014-05-28
Junio C Hamano
Merge branch 'mw/syml
i
nks' into maint
commit
|
commitdiff
|
tree
2014-05-28
Junio C Hamano
Git 2
.
0
commit
|
commitdiff
|
tree
2014-05-21
Ju
n
io C Ha
m
an
o
Update draft re
l
eas
e
notes
t
o
2
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Junio C
H
amano
Gi
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 several gram
m
ar issues, no
t
a
bly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Juni
o
C
H
a
m
a
n
o
Revert
"Merge branch 'jc/gr
a
duate-remote-hg-bzr' (early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Junio
C H
a
mano
M
erg
e
bra
n
ch
'j
c
/graduate
-
r
emote-hg
-
bz
r
'
(
early part)
commit
|
commitdiff
|
tree
2014-05-20
Junio C H
a
mano
remote-helpers: poin
t
a
t
their upstream repositories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Felip
e
Contrera
s
contrib: remo
t
e
-helpers: add move warning
s
(v2
.
0)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-20
Ju
n
i
o
C
Hama
n
o
Revert "Merge
b
ranch 'fc/transport-he
l
per-sync-error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
Junio C
Ha
m
ano
Merge branc
h
'
rh/p
r
om
p
t-pcmod
e
-avoid-
e
v
al-o
n
-
refname
'
commit
|
commitdiff
|
tree
2014-05-19
Ri
c
h
a
rd Hansen
git-prompt
.
sh: don't assume the
shell expands the value
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
Junio C
H
amano
M
erge branch 'lt/r
e
qu
e
st-
p
ul
l
'
commit
|
commitdiff
|
tree
2014-05-19
J
u
nio C Hamano
Mer
g
e branch 'jl/use-vsatisf
y
-correctly-for
-
2
.
0'
commit
|
commitdiff
|
tree
2014-05-19
Junio C Hamano
Me
r
ge
g
it://g
i
th
u
b
.
com/git-l10
n
/git-po
commit
|
commitdiff
|
tree
2014-05-19
J
u
nio C Hamano
M
e
r
ge branch
'kb
/
fast-h
a
shmap'
commit
|
commitdiff
|
tree
2014-05-19
An
d
e
r
s
K
aseorg
D
o
cumentation/techn
i
c
a
l/api-ha
s
hmap: remov
e
source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-19
Jens
L
ehm
a
nn
git-gui: tolerate
m
ajor ve
r
sion c
h
anges when co
m
paring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-16
Junio C Hamano
r
equest-p
u
l
l
:
r
e
surr
e
ct
f
o
r
-
linus -> ta
g
s/for-linus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-13
Junio C
H
amano
M
erge branch 'fc/prompt-
z
sh-read-from-file'
commit
|
commitdiff
|
tree
2014-05-13
Fe
l
ipe Contreras
contrib:
c
ompletion: fix 'er
e
ad(
)
' namespac
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-12
Junio C Hamano
Mer
g
e git://github
.
com/git-l10n/git-p
o
commit
|
commitdiff
|
tree
2014-05-09
J
unio C Hamano
Git 2
.
0-r
c
3
commit
|
commitdiff
|
tree
2014-05-09
Junio C Hamano
Sync with 1
.
9
.
3
commit
|
commitdiff
|
tree
2014-05-09
Ju
n
io C Hamano
Git 1
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Junio
C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2014-05-08
Jonatha
n
Nieder
shell
d
oc: rem
o
v
e
st
r
ay "+
"
i
n
example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Me
r
ge git://githu
b
.
com/git-l10n/g
i
t-
p
o
commit
|
commitdiff
|
tree
2014-05-08
Juni
o
C Hama
n
o
Start
preparin
g
for 1
.
9
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-08
Junio C
Ha
m
ano
Merg
e
b
ranch 'c
l
/
p
4-use-di
f
f-tr
e
e' into mai
n
t
commit
|
commitdiff
|
tree
2014-05-08
Junio C Ham
a
no
M
e
rge b
r
anc
h
'rh/prompt-pcmode-avoid-
e
val-
o
n-refn
a
me
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
M
e
r
g
e
b
r
anch
'km/a
v
oid-non-
f
unction-return-in-rebase
.
.
.
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Merge branch 'tb/
u
n
icode-6
.
3-zero-w
i
dth' int
o
main
t
commit
|
commitdiff
|
tree
2014-05-08
Junio C Hamano
Me
r
ge bra
n
ch 'km/avoid-
b
s-i
n
-shell-glob' into mai
n
t
commit
|
commitdiff
|
tree
2014-05-08
Junio
C
Hamano
Merge branch 'km/avoid-cp-a'
i
n
to maint
commit
|
commitdiff
|
tree
2014-05-07
J
u
nio C Hamano
U
pd
a
te draft
release
n
otes for 2
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-07
Junio
C Hamano
Me
r
g
e
b
ranch 'cl/p4-use-diff-t
r
ee'
commit
|
commitdiff
|
tree
2014-05-07
Tolga Ceyla
n
g
it-p4
:
forma
t
-pa
t
ch to diff-tr
e
e
c
hange breaks b
i
n
ary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-07
Øyvind A
.
H
olm
RelNotes/2
.
0
.
0: Grammar and
ty
p
o fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-05-02
Junio C Hamano
Git
2
.
0
-
r
c
2
commit
|
commitdiff
|
tree
2014-05-02
Junio C Hamano
Merge branch 'mw/symlinks'
commit
|
commitdiff
|
tree
2014-05-02
Junio
C
Hamano
Mer
g
e branch 'km/git-svn-workaround-ol
d
er-
g
e
t
op
t
-long'
commit
|
commitdiff
|
tree
2014-05-02
J
u
nio
C Ha
m
ano
Me
r
ge b
r
anch 'rh/prom
p
t
-pcmod
e
-avoid-e
v
a
l
-on-refna
m
e
'
commit
|
commitdiff
|
tree
2014-05-02
J
u
nio C Hama
n
o
Me
r
ge
b
ranch 'mk/d
o
c
-
git
-
gui-display-unt
r
acked'
commit
|
commitdiff
|
tree
2014-04-30
Davi
d
T
urner
d
ocs: docum
e
nt
R
U
N
_SE
T
UP_GENTL
Y
and clar
i
f
y RUN_SETUP
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-30
Junio C Hamano
Merge git
:
//github
.
com/git-l10n/g
i
t-po
commit
|
commitdiff
|
tree
2014-04-30
J
unio C Haman
o
Re
v
e
rt the
wh
o
l
e
"ask curl-c
o
nfi
g
" to
p
ic f
o
r now
commit
|
commitdiff
|
tree
2014-04-30
Felipe Contreras
rerere: fix
for mer
g
e
.
conflictstyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-28
Junio C Ham
a
no
M
erge branch 'db/make-with-curl'
commit
|
commitdiff
|
tree
2014-04-28
J
u
nio C Hamano
Merge branch
'
jk/exte
r
nal-diff-use-
a
rgv-array' (early
.
.
.
commit
|
commitdiff
|
tree
2014-04-28
Dave Bo
r
ow
i
tz
Makefile:
d
efault to -lcu
r
l when
n
o CURL_CONFIG or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-25
Ju
n
io C Hamano
G
i
t
2
.
0-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-25
Jean-Ja
c
ques Lafay
git tag --contains:
a
voi
d
s
tack overf
l
ow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-24
Martin Erik We
r
ner
setup:
fix wind
o
ws path bu
f
f
e
r over-stepping
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-24
Juni
o
C H
a
m
ano
M
erge branc
h
'jk/pack-bitmap'
commit
|
commitdiff
|
tree
2014-04-24
Junio C Hamano
Merge branch
'
fc/trans
p
ort-helpe
r
-sync-err
o
r-fix'
commit
|
commitdiff
|
tree
2014-04-24
Junio C Haman
o
Me
r
ge b
r
anch 'db/
m
ake-wi
t
h-curl'
commit
|
commitdiff
|
tree
2014-04-24
Junio C Hamano
mergetool: docume
n
t the
default for --[no-]prompt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-23
Matthieu Moy
g
i
t-remote-m
e
diawiki: fix e
n
coding
i
ssue f
o
r
UTF-8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-23
Ma
t
th
i
eu Moy
git-remote-m
e
d
i
awiki: allow stop/sta
r
t-ing
t
he
test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-23
K
y
l
e J
.
McKa
y
t911
7
: use --p
r
efix
"
" i
n
st
e
ad
o
f --pre
f
ix=""
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-23
Junio C Hama
n
o
send-email
:
w
indows
dr
i
ve prefix (e
.
g
.
C:)
app
e
ars
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-23
Jiang Xin
blam
e
: dyna
m
ic blam
e
_date_width for di
f
fe
r
en
t
loc
a
les
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-23
Jiang
X
in
blame: fix broken time_
b
u
f
p
adding
s
in relative time
s
tamp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-22
Kyle J
.
McKay
ewah_bi
t
m
a
p
.
c: do not assu
m
e size_t a
n
d eword_t are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-22
F
e
lipe Contr
e
ras
merge: enable defaulttoupstream
by defaul
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-22
Fe
l
ipe Contreras
m
e
rge
t
ool:
run prompt only if
g
uessed tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-22
Felipe
C
o
n
treras
mergeto
o
ls: add vimdiff3 mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-22
Rich
a
rd Ha
n
sen
git-prompt
.
sh: don't put
u
nsanitized branch
names
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-22
Luis R
.
Rodrig
u
ez
git
.
c: tre
a
t RUN_SET
U
P_GENTLY and
RUN
_
SE
T
UP a
s
m
u
tually
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-21
J
unio C Hamano
Update
d
raft re
l
e
ase notes to 2
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-21
Junio
C
H
a
ma
n
o
Merge
g
it://bogomips
.
org/git-sv
n
commit
|
commitdiff
|
tree
2014-04-21
Jun
i
o
C Hamano
Merg
e
branc
h
'jx/i18n'
commit
|
commitdiff
|
tree
2014-04-21
Junio C
H
a
m
a
n
o
Merge br
a
n
ch '
k
m/avoid-non-f
u
nction-return-in-re
b
ase'
commit
|
commitdiff
|
tree
2014-04-21
Juni
o
C
Hama
n
o
Merge branc
h
'ep/shell-command-
s
u
b
st
i
tution
'
commit
|
commitdiff
|
tree
2014-04-21
Fel
i
p
e
Contreras
t5801
(remote-helpers): cleanup environm
e
nt sets
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2014-04-21
Max Kirillov
D
o
cu
m
entation
:
git-g
u
i: describ
e
gui
.
displayuntrac
k
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next