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
apply: register conflicted stages to the index
2012-07-09
J
u
n
i
o C Hamano
apply: regist
e
r
conflic
t
e
d stages
to the ind
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: --3way with add/add
c
o
nflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move verify_index_m
a
tch() hi
g
her
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: plug the three-way merge log
i
c
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: f
a
ll bac
k
on three-wa
y
me
r
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Hamano
apply: accept
-3/--3w
a
y c
o
mm
a
n
d
lin
e
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
appl
y
: move "alr
e
a
d
y exists" logic to ch
e
ck_to
_
create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
a
pply: m
o
v
e
check_t
o
_create_
b
lob() c
l
oser to
i
ts sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: further split lo
a
d_preima
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
a
p
p
ly: refactor
"previous
patch" log
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
appl
y
:
s
plit load_preimage() helper functi
o
n
out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: f
a
c
tor o
u
t chec
k
out_target() he
l
pe
r
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply:
r
efactor read_file
_
or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
cle
a
r_image() clears
things
a
b
i
t more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
apply: a bit more comments on P
A
TH_TO_BE_D
E
L
E
TED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: fix an incomplete comment
in check_pat
c
h(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio C H
a
mano
T
he ninth bat
c
h
of topics graduated
to 'master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Mer
g
e branch 'nh/empty-
r
ebas
e
'
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C
H
amano
M
erg
e
branch '
z
j/dif
f
-em
p
ty-chmod'
commit
|
commitdiff
|
tree
2012-05-07
Jun
i
o
C Hamano
Merge branch
'jk/maint-t
f
ormat-with
-
z'
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge br
a
n
c
h 'th/difftool-dif
f
all
'
commit
|
commitdiff
|
tree
2012-05-07
Junio
C Hamano
Sync with maint
commit
|
commitdiff
|
tree
2012-05-07
Juni
o
C
Hamano
Start preparing
for 1
.
7
.
1
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-07
Junio
C Hama
n
o
M
erge bran
c
h 'jk
/
maint-gitweb-tes
t
-use-san
e
-perl' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge branch
'js/daemon-te
s
t
-
race-fix' into maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Ham
a
no
Merge bra
n
ch
'jk/maint
-
config
-
bogus-section' into maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Merge
branch 'pw/t5800-i
m
port-ra
c
e-fix' i
n
to maint
commit
|
commitdiff
|
tree
2012-05-07
Junio C Hamano
Mer
g
e bra
n
c
h
'rt
/
cherry-re
v
ert-conf
l
ict-summary' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Ju
n
i
o
C
H
a
mano
Merge
bra
n
ch '
c
b/maint-re
p
ort-m
o
unt-point
-
corr
e
ctly
.
.
.
commit
|
commitdiff
|
tree
2012-05-07
Pete Wyckof
f
git p4 do
c
: fix fo
r
m
a
tti
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-04
Nguy
ễ
n
T
h
á
i Ngọc D
u
y
M
akefile: kee
p
many va
r
iable list sort
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-03
Neil Horman
git cherry-p
i
ck:
d
o not der
e
ference
a
potential
N
ULL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-03
Ju
n
io C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2012-05-03
J
uni
o
C Hamano
Merge branch
'
j
c/merge-reduce-parents-early' into maint
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
Hamano
Merge branch
'
c
b
/cherry-pick-rev-path
-
co
n
fusion' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
n
i
o C Ham
a
no
Merge
branch
'cb/http-multi-curl-auth'
i
nto
m
ai
n
t
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C Hamano
Me
r
g
e
branch 'mb/fetch-call-a-non-
b
ranch-a-ref' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
J
u
nio C Hamano
Merge branch 'rl/maint-s
t
ash-i18n-save-error' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio
C
H
amano
Mer
g
e bra
n
ch 'jm/maint
-
strncpy-dif
f
-
no-i
n
dex' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Me
r
ge branch
'jk/
m
aint
-
push-progress
'
commit
|
commitdiff
|
tree
2012-05-03
Junio C Hamano
Me
r
ge bran
c
h
'
nd
/
columns'
commit
|
commitdiff
|
tree
2012-05-03
J
eff King
d
o
c/con
f
ig: fix
i
nli
n
e literals
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
The eighth batch of topics grad
u
ate
d
to 'master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C
Hamano
Merge br
a
nch 'master' of git://git
.
b
ogomip
s
.
org/git-
s
vn
commit
|
commitdiff
|
tree
2012-05-02
Jun
i
o C Hamano
Merge
b
ra
n
ch 'tr/x
d
iff
-
fast-hash'
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
M
e
r
g
e branch
'
jk/
m
aint-gitweb-test-use-sane-perl'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C Haman
o
M
e
r
ge br
a
nch
'
pw/message-cl
e
anup'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
M
erge
branch 'zj/di
f
f-stat-sma
l
ler-num-columns'
commit
|
commitdiff
|
tree
2012-05-02
J
un
i
o
C Hamano
Merg
e
b
ranch 'pw
/
p4-vario
u
s'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Ham
a
no
Merge b
r
a
n
ch
'
jc/rerere-train'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Me
r
ge
branc
h
'ab/i18n'
commit
|
commitdiff
|
tree
2012-05-02
Juni
o
C Ha
m
a
n
o
Merge bra
n
ch 'l
p
/diffst
a
t-with-gra
p
h'
commit
|
commitdiff
|
tree
2012-05-02
J
u
n
io C Hamano
Merge
b
ranch 'zj/mksh-columns-bre
a
kage'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge
branch 'jk/
d
oc-asciidoc-inline-lit
e
ral'
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'nd/i1
8
n'
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
m
ano
M
e
rg
e
bra
n
c
h
'mm/simple-push'
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C H
a
mano
M
e
rge bran
c
h 'jc/index-v4'
commit
|
commitdiff
|
tree
2012-05-02
Johannes
Sixt
t
4
006:
Wi
n
dows do not have /de
v
/
z
ero
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Zb
i
gniew J
ę
drzejewsk
.
.
.
diff --stat: do
n
ot run diff on indentical
f
i
l
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Zbi
g
ni
e
w Jędrze
j
ewsk
.
.
.
diff --stat: r
e
port mode-on
l
y
chan
g
e
s
for
binary
f
iles
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Junio C
H
amano
Merge branc
h
'
mast
e
r' of https://github
.
com/git-l
1
0n
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
S
y
nc
w
ith v1
.
7
.
10
.
1
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
man
o
G
i
t 1
.
7
.
1
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-02
Ju
n
io C
H
amano
Mer
g
e br
a
nch 'pw
/
f
a
s
t
-imp
o
rt-dataref-pa
r
sing' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hama
n
o
Merge branch 'it/fetch-pack
-
many-refs' into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio C
Hamano
Merge branch 'jl
/
maint-submodule-recurse-fe
t
ch' into
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C Hamano
Merge branch 'jc/ma
i
nt-bl
a
me
-
minimal' into maint
commit
|
commitdiff
|
tree
2012-05-02
Junio
C Hamano
Me
r
ge bran
c
h 'lp/m
a
int
-
diff-th
r
ee-d
a
sh-wi
t
h-g
r
aph'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
J
u
nio C Hamano
Merg
e
branch 'jk
/
rebase-i-submodule-con
f
lict-on
l
y'
.
.
.
commit
|
commitdiff
|
tree
2012-05-02
Junio C H
a
mano
M
e
rge bran
c
h 'maint' of
h
ttps://github
.
c
o
m/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Jędrzejewsk
.
.
.
C
onsis
t
ently use perl from /usr/bin/ f
o
r scripts
Suggested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
T
h
o
m
a
s
Rast
xdiff:
choose XDL_FAST_
H
ASH c
o
de
o
n sizeof(
l
ong) in
s
tead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff King
t/
g
i
twe
b
-lib:
u
se $PERL_PATH to
r
un gitweb
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Zbigniew Jędr
z
eje
w
sk
.
.
.
te
s
ts:
c
h
eck --[
s
hort
]
stat output after ch
m
od
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Zbign
i
ew Jędrzejewsk
.
.
.
te
s
t: modern
i
ze style of t4006
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Juni
o
C Hamano
log-tree
:
the pre
v
i
o
u
s
o
n
e is still
not
quit
e
r
i
g
ht
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jan K
r
üger
log-t
r
ee: u
s
e custom l
i
ne terminator in line termina
t
io
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Je
f
f King
t5541:
te
s
t more combina
t
i
o
ns of --progres
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
Jeff King
teach send-pack about --[no-]progre
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-05-01
J
eff
K
in
g
send-pack: show progress
when isatt
y
(2)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
git p4: submit
files with wildca
r
ds
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
g
i
t p4: fix wri
t
able file a
f
te
r
r
e
n
ame or copy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
git
p
4: te
s
t
submit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
P
e
te
W
yckoff
git p4: br
i
ng back files in del
e
ted
c
li
e
nt directory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
P
e
t
e Wy
c
ko
f
f
remove
b
lank f
i
lename in err
o
r messa
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Pete Wyckoff
re
m
ove sup
e
rfluous n
e
wlines i
n
error mes
s
ages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
J
u
nio C Hamano
M
erge br
a
nch 'ld/git-p4-tags-
a
nd-labels'
commit
|
commitdiff
|
tree
2012-04-30
Ju
n
io
C
Hamano
Me
r
ge
bra
n
ch 'n
h
/emp
t
y-rebase'
commit
|
commitdiff
|
tree
2012-04-30
Junio
C
Hama
n
o
Merge b
r
anch 'j
k
/maint-confi
g
-bogus-secti
o
n'
commit
|
commitdiff
|
tree
2012-04-30
Zbigniew Jędrzejewsk
.
.
.
diff --stat: use less c
o
lumns for
c
hange c
o
unts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o C Hamano
c
o
ntri
b
/rerere-trai
n
: use
i
nsta
l
led git-sh-setup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arnfjörð Bjarmason
git-comm
i
t: remove lego in i18n messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Æ
v
a
r
A
rnf
j
ö
r
ð
B
jarmason
git-commi
t
: remove
l
e
g
o in i18n messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Ævar Arnfjö
r
ð Bjarmas
o
n
git-branch
:
remove lego in i18n mes
s
ages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
J
unio C Haman
o
Th
e
s
eventh batch of
t
o
p
ics graduate
d
to 'master'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-04-30
Jun
i
o C Haman
o
Merge
b
ra
n
ch 'js/dae
m
on-te
s
t
-
race-fix
'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
Hamano
Merge branch
'
kk/gitweb-omit-expensive
'
commit
|
commitdiff
|
tree
2012-04-30
Junio C Hamano
Merge branch
'kk/ma
i
nt-gitweb-missing-owner'
commit
|
commitdiff
|
tree
2012-04-30
Juni
o
C
Hamano
M
erge b
r
anch 'rs/
c
ommit-l
i
st
-
append'
commit
|
commitdiff
|
tree
2012-04-30
Junio C
H
amano
Merge
b
ranch 'mm/
i
ncl
u
de-
u
serpath'
commit
|
commitdiff
|
tree
next