repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make difftool.prompt fall back to mergetool.prompt
2010-01-22
Se
b
astian S
c
huberth
Make d
i
fftool
.
prompt f
a
ll back to merg
e
tool
.
prompt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Ramsay Jones
engi
n
e
.
p
l: Fix a
re
c
ent breaka
g
e of the
buildsystem
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Ju
n
io C Hamano
g
it-mv: fix moving more than o
n
e source t
o
a si
n
gle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
M
icha
e
l Hagger
t
y
r
e
base -i: Enclose
s
ed command substitution in quotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Micha
e
l
H
a
ggerty
rebase -i: Avoid non-portable "test
X
-a Y"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus
Torvalds
make "index-pack" a
b
uilt-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus Tor
v
a
lds
make "git pack-red
u
nda
n
t" a
built
-
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus
Torva
l
ds
mak
e
"git un
p
ack-file
"
a built-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus
T
orv
a
ld
s
make "mkt
a
g" a
built-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
mak
e
"mer
g
e-index" a bui
l
t
-
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Joha
n
nes
S
ixt
m
e
r
ge-tr
e
e:
re
m
ove unneces
s
ary call
o
f
g
it_extract_argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
L
inus Tor
v
a
l
ds
m
ake "git patch-
i
d" a built
-
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Lin
u
s Tor
v
alds
make "g
i
t v
a
r
"
a built-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Nico
l
as Pitre
fi
x
git-p4 editor inv
o
c
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
J
unio
C Hamano
Mer
g
e br
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2010-01-22
Linus T
o
rv
a
ld
s
make
"
git hash-object" a built-i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus To
r
val
d
s
make
"
gi
t
merge-t
r
e
e" a b
u
i
l
t-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvald
s
slim down "git show-index"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
Remove diff mac
h
inery depende
n
cy fro
m
read-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
merge-recursive
:
do not
ret
u
rn NULL
on
l
y
to
c
ause segfault
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Horst H
.
vo
n
B
r
and
git-rebas
e
.
txt: Fix spel
l
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
T
a
y R
a
y Chuan
retry request without query whe
n
info/refs?query
f
ails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Johannes Sixt
Make
'
rerere forget' w
o
rk from a subdirectory
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Johanne
s
Sixt
Ma
k
e test case number
s
un
i
que
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
conflict-marker-size:
a
d
d
test a
n
d
d
ocs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
H
amano
Updat
e
draft
release not
e
s to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merg
e
b
ranch 'bw
/
c
vsimport'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
Hamano
Merge
branch '
j
c/che
c
kou
t
-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Mer
g
e
b
r
a
nch 'ag/pa
t
c
h-header-
v
erify'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
H
amano
Merge
b
ranch
'jc/conflict-m
a
r
ker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge branch 'ag/mai
n
t-a
p
ply
-
t
oo-
l
arge-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
M
e
rge bran
c
h 'ap/merge-ba
c
k
e
n
d-
o
p
t
s'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C Hamano
Merge branc
h
'nd/status-par
t
ial-refr
e
sh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge remo
t
e b
r
an
c
h 'remotes
/
tras
t
-doc/for-next'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Merge branch
'
jh/notes' (early
part
)
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
e
rge br
a
n
c
h
'm
a
i
n
t'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
M
e
rge
branch 'jc/maint-r
e
f
resh-ind
e
x-
i
s-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merg
e
branch
'rr/cor
e
-tut
o
r
ial'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Haman
o
Merge bra
n
ch 'jc
/
cache-unmerg
e
'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch 'js/exec-error-report'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
Merge bran
c
h 'jc/ls
-
files-ignored-paths
p
ec'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
M
e
rge br
a
nch 'jc
/
grep-lookahead'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge branch 'jc
/
ma
i
nt-
s
t
rbuf-add-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Haman
o
Merge branch 'mm/c
o
nflict-
a
dv
i
ce'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'da/di
f
ftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge bra
n
ch 'm
h
/reb
a
s
e
-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch 'ns
/
reb
a
se-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge
branch '
m
h/reb
a
se-fixup' (ea
r
ly part
)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge
bra
n
ch 'il/push-
s
et-upstr
e
a
m
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
ama
n
o
Merge branc
h
'jk/warn-author-committer-after
-
commit'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Mer
g
e
branch 'j
c
/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
e
r
g
e branch 'tr/http
-
push-
r
ef-status'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
Merge branch 'bk/f
i
x-relati
v
e-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C Ham
a
n
o
Me
r
ge branch
'sd
/
cd-p-sho
w
-toplev
e
l'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge
b
r
a
nch 'jc
/
symbol-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
date
.
c: mark file-l
o
c
a
l function
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ha
m
ano
Sync with
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
G
i
t
1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
M
e
r
ge branch
'
bg
/
maint-
r
em
o
te-u
p
date-default'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge br
a
nch 'sb/maint-octopu
s
'
into maint
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merge bra
n
c
h
'bg/ma
i
nt-add-all-doc'
i
nto
m
a
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
M
erge
b
r
anch 'm
a
int-1
.
6
.
5
' i
n
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Git 1
.
6
.
5
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge branch 'j
k
/
m
aint-1
.
6
.
5-reset-ha
r
d'
i
n
t
o
ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ham
a
no
Merge branch '
t
r/main
t
-1
.
6
.
5-bas
h
-pro
m
pt-show-submo
d
ule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
man
o
M
e
rge branch 'dp/m
a
int-1
.
6
.
5-fast-import-non-
c
omm
i
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Merge
bra
n
ch 'jm/maint-1
.
6
.
5
-grep-NUL-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C Ha
m
ano
Fix
"
checkout A
.
.
.
" s
y
n
o
nym for "ch
e
ckout
A
.
.
.
HEA
D
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
status:
d
on't requi
r
e the reposito
r
y
t
o be w
r
itable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Johannes Sixt
Makefile: honor NO_CURL when setting REMOTE_CURL_*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan Casebolt
ident
.
c: replac
e
fprintf with fputs to suppress com
p
iler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ngu
y
ễn Thái Ngọc Duy
rm:
on
l
y r
e
fresh entries th
a
t
we may
t
o
u
ch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
David Ripton
bisect: fix
s
ingular/plural grammar nit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben
Walton
cvsimp
o
rt: standarize
s
ystem() ca
l
ls to
e
xtern
a
l
git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimp
o
r
t:
s
tandarize open(
)
c
a
lls to external git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimport: modernize
c
allouts to git sub
c
omman
d
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C Hamano
Me
r
ge branch 'maint-1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Merge branch 'maint-1
.
6
.
3
' into mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
b
r
anch 'mai
n
t-1
.
6
.
2' into ma
i
nt-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Haman
o
Merge co
m
mit '
v
1
.
6
.
4
.
4-8-g8de6518'
i
nto mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
H
ama
n
o
F
i
x mis-backpo
r
t of t7
0
02
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Ha
m
a
n
o
Update draft rel
e
a
s
e notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hama
n
o
Merge branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
U
p
d
ate draft release notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
anch 'dp/ma
i
nt-1
.
6
.
5-fast-import-non
-
c
o
mmit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merg
e
branch '
j
c/rerere
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge branch '
p
c/uninteresting-submodu
l
e-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge branch 'nd/include-t
e
rm
i
o
s
-for-o
s
ol'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hama
n
o
Merge branch
'
js/windows'
commit
|
commitdiff
|
tree
2010-01-19
A
n
d
r
ea
s
Gruenbacher
builtin-apply
.
c: fix the --- and +++ header
filename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
D
a
niel Barka
l
ow
Replace parse_blob
(
) wit
h
a
n exp
l
anatory commen
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hama
n
o
Merge b
r
anch 'jm/maint-1
.
6
.
5
-grep
-
N
UL-
t
e
rminate' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim
M
eyering
g
r
ep: NUL terminate input
fr
o
m
a file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Andreas
G
ruenbache
r
b
u
iltin
-
ap
p
ly
.
c: Skip filenames wit
h
out
e
nough components
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
s
ymlinks
.
c: rem
o
ve unused funct
i
ons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
obj
e
ct
.
c: remo
v
e unu
s
ed functi
o
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
D
o
cume
n
t
that
merge strategies can now
tak
e
their own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery
P
ennarun
E
x
tend merge-subtree tests to test
-
Xsubtree=dir
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
a
no
Make "
s
u
b
tree" part
more orthogonal to the
rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next