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
Seb
a
stian Schu
b
erth
Make difftool
.
prompt fall
b
a
c
k
t
o mergetool
.
prompt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Ra
m
say Jone
s
engine
.
pl: Fix a recent bre
a
k
age of t
h
e
buildsystem
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Junio C H
a
mano
g
i
t
-m
v
: fix moving more th
a
n
one source to a sin
g
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Michael Hag
g
erty
re
b
ase -i: Enclose se
d
command
s
ubstitution in quotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Michael Hagg
e
rty
re
b
ase -i: Avoid n
o
n-portable "test X
-a Y"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus To
r
valds
make "index
-
pack"
a bui
l
t-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
make "git pa
c
k-redundant" a built-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
m
ake "git unpack-file"
a b
u
ilt-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus To
r
va
l
ds
make "mkta
g
" a built-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
L
i
nus
To
r
valds
make "merge-index
"
a built-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
J
o
h
a
nnes Sixt
merge-tree: remove
unne
c
essar
y
call of git_extract_a
r
gv0_pat
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus To
r
va
l
d
s
make "git patch-id" a built-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Lin
u
s Torvald
s
m
a
ke "gi
t
var" a buil
t
-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Nicolas Pitre
fix git-p4 ed
i
tor invocation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
J
u
nio C Hamano
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-01-22
Li
n
us Torvalds
m
ake "git
hash-object" a built-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
make "git
merge
-
tree" a b
u
ilt-in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
slim down "git sh
o
w-ind
e
x"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
L
inus Torvalds
Remove diff ma
c
hin
e
ry depend
e
ncy from read
-
cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-22
J
u
nio
C Ha
m
a
no
merge-recursive: do n
o
t retu
r
n
N
ULL only to cause segfau
l
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Horst H
.
von Bra
n
d
g
i
t-
r
eb
a
s
e
.
txt: Fix spellin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Tay
Ray Chuan
re
t
ry reques
t
wi
t
hout query when info/refs?query fails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Johannes
S
ixt
Make 'rerere f
o
r
get
'
work
f
rom a s
u
bdirect
o
ry
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Johann
e
s Si
x
t
M
a
ke tes
t
c
ase
n
umbe
r
s
u
n
i
que
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
conflict-marker-size
:
add test and doc
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Upd
a
te draf
t
release notes to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
a
m
ano
Me
r
g
e
bran
c
h '
b
w/cv
s
import'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
ma
n
o
Merge
b
r
anch 'jc/ch
e
ck
o
ut
-
merge
-
base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Merge branch 'ag/patch-header-v
e
rify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge b
r
anch '
j
c
/conflict-marker
-
size
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
M
erge bra
n
ch 'ag/main
t
-apply-too-larg
e
-p
'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Haman
o
Merge
b
ranch 'a
p
/merge-backend-o
p
ts'
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hama
n
o
Merg
e
branc
h
'
n
d/sta
t
us
-
partial-r
e
fres
h
'
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C Hamano
Merg
e
remo
t
e
b
ranch 'remot
e
s/tr
a
s
t-doc
/
f
or
-
ne
x
t'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
g
e
b
ran
c
h 'j
h
/notes' (e
a
r
l
y part)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Ha
m
ano
Merge bra
n
ch 'jc
/
maint-refre
s
h-index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e branch 'rr/c
o
re-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge
branch '
j
c/
c
ache-un
m
erge'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merge branch 'js/exec-
e
rror-re
p
o
rt'
commit
|
commitdiff
|
tree
2010-01-20
J
un
i
o
C Hama
n
o
Merge branch '
j
c/ls-files-igno
r
ed-pathspec
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merge
branch 'jc/grep-loo
k
ahea
d
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
bran
c
h 'jc/m
a
i
n
t-strb
u
f
-
add-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C Hamano
Merge bra
n
ch 'mm/
c
o
n
flict-ad
v
ice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
mano
Merge bra
n
ch 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Ham
a
no
Merge branch 'ns/rebase-auto-squas
h
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge
b
ran
c
h
'mh/reb
a
s
e
-
f
i
xup'
(early part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
ranch 'il
/
push-set-upstream'
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io C Hamano
M
e
rge branc
h
'jk/w
a
rn-
a
uthor-co
m
m
itter-after-
c
ommit'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Mer
g
e branch '
j
c/ident'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merg
e
branch 'tr/http-pu
s
h-ref
-
status'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
amano
Merge branch
'
b
k
/fix-relative-gitdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge
b
r
anch 's
d
/cd-p-sho
w
-t
o
plevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Mer
g
e
branch 'jc/symb
o
l-
s
t
a
t
ic'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
d
ate
.
c: mark fi
l
e-local function
stat
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Sync w
i
th 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C Hamano
Merge
b
r
a
n
c
h 'bg/maint-remote-update-defaul
t
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
erge branch 'sb/maint-octopus'
i
n
to maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merg
e
branch 'bg/mai
n
t-
a
dd-al
l
-doc' i
n
t
o
maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
maint-1
.
6
.
5' int
o
main
t
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
erge b
r
anch
'
jk/mai
n
t-1
.
6
.
5-reset
-
ha
r
d' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'tr
/
maint-1
.
6
.
5-bash-pro
m
p
t
-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Merge branch 'dp/maint
-
1
.
6
.
5-fas
t
-
i
mport-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge b
r
anch
'j
m
/maint
-
1
.
6
.
5-grep-NUL-terminate'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix "
c
heck
o
ut A
.
.
.
" syno
n
ym
for "che
c
kout A
.
.
.
HEAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Ham
a
no
status: d
o
n'
t
re
q
u
i
re t
h
e rep
o
sitory to be wri
t
a
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C H
a
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Johann
e
s Sixt
Makefile
:
honor NO_CURL when setting R
E
MOTE_CURL_*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan C
a
se
b
ol
t
i
d
ent
.
c: repl
a
ce fprintf wit
h
f
pu
t
s
t
o
s
u
pp
r
e
ss co
m
piler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn Thái N
g
ọc Du
y
rm: only refresh entri
e
s
that w
e
may touch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
D
avid Ripton
bisect:
f
i
x
sin
g
u
l
ar/plural grammar
n
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvs
i
mport
:
standarize system(
)
calls to external
git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimport: standarize
open() call
s
to external git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walt
o
n
cvsimport
:
mod
e
rnize callouts
t
o git
su
b
c
o
mmand
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge branch 'm
a
int-1
.
6
.
4
'
i
nto m
a
in
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch 'maint-1
.
6
.
3' i
n
to maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C
H
amano
Merge bra
n
ch 'maint
-
1
.
6
.
2'
in
t
o maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge commit 'v1
.
6
.
4
.
4-8-g8de651
8
' int
o
m
ain
t
-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o
C
H
a
mano
F
ix mis-bac
k
port of t
7
002
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Upd
a
t
e draft re
l
ease note
s
t
o 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C Ham
a
n
o
Update dra
f
t
release notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge
b
ranch 'd
p
/m
a
i
n
t-1
.
6
.
5-fast-impor
t
-non-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
u
ni
o
C Hamano
Merge br
a
n
ch '
j
c
/
r
erere'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
M
erge
branc
h
'pc/unint
e
res
t
ing
-
submod
u
le-disappea
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'
nd/includ
e
-te
r
mios-for-
o
sol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'
j
s
/windows'
commit
|
commitdiff
|
tree
2010-01-19
Andr
e
as Gruenbache
r
builtin-apply
.
c: fix the ---
and +
+
+
h
eader filename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Daniel Barkalow
Replace parse_blob
(
)
w
ith an
expl
a
n
atory
c
omment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
a
ma
n
o
Merge branch 'jm/
m
a
int-1
.
6
.
5-gr
e
p-NUL-termi
n
a
te'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim M
e
yering
g
re
p
: NUL te
r
minate in
p
u
t
from a fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
And
r
e
a
s
G
r
uen
b
a
c
her
b
uiltin-apply
.
c: Ski
p
f
i
l
enam
e
s
without en
o
ugh compon
e
nt
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C
H
a
mano
symli
n
ks
.
c: re
m
ove unused
f
unctio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
Hamano
object
.
c
: remove unused fun
c
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
man
o
Document t
h
at
m
e
rge s
t
rategies can now t
a
ke their ow
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pe
n
narun
Extend merge-subtree
t
e
s
t
s to test -
X
su
b
tree=dir
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Hamano
Make "s
u
btree" part
m
o
r
e ort
h
ogo
n
al
t
o
the rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next