repo.or.cz
/
git
/
jnareb-git.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
Sebast
i
an
S
chube
r
th
M
a
ke diffto
o
l
.
p
ro
m
pt fall bac
k
to
mergetool
.
p
r
ompt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Ramsay Jones
e
ngine
.
p
l: Fi
x
a recent breakage
o
f the buildsyst
e
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
J
uni
o
C Ha
m
ano
git
-
mv: f
i
x m
o
ving
m
o
re th
a
n
one sour
c
e
t
o a si
n
gle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Michael Haggert
y
rebas
e
-i: En
c
lose se
d
command su
b
stitution in quotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
M
ichael Ha
g
gerty
rebase
-i: Av
o
id non-po
r
table "test X
-
a Y"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
make "in
d
ex-pack" a built-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
L
i
nus To
r
val
d
s
ma
k
e "gi
t
p
a
ck-redundant
"
a built-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus
T
orvalds
make "git unpa
c
k-
f
i
l
e
" a built
-
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
make "mktag" a b
u
ilt-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
L
inu
s
T
o
r
vald
s
m
a
k
e "m
e
rge-index" a built-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Johannes S
i
xt
m
e
rge-tree: re
m
ove unnecessary
c
all of git_ex
t
ra
c
t
_
a
rgv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torva
l
ds
ma
k
e "
g
i
t pa
t
ch-id" a bui
l
t
-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
make "git var" a built-in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Nicolas Pitre
fix
git-p4 e
d
itor inv
o
cation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
Merge br
a
n
ch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2010-01-22
Linus Torva
l
ds
m
ake "git hash-object" a built
-
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus
Torval
d
s
make "gi
t
merge-tree" a b
u
i
lt-i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Linus Torvalds
slim down "git sho
w
-
i
ndex"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
L
inus Torvalds
Remove dif
f
machinery dependency from read-cac
h
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio C Ha
m
ano
me
r
ge-recursi
v
e: d
o
no
t
r
eturn NULL only to cause segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
H
o
r
s
t
H
.
von Brand
git-reba
s
e
.
t
xt: Fix spelling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
T
ay Ray Chua
n
retry
r
e
q
uest without query w
h
en info/refs?query fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
ohannes Sixt
Make 'rerere forget
'
work f
r
om a subdirectory
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Johannes Sixt
Make test case numbe
r
s unique
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C Hamano
c
o
nflict-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
Update
d
ra
f
t rel
e
ase notes t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o C
H
amano
Merge branch
'bw/c
v
sim
p
ort'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
i
o
C
Hamano
Me
r
ge bran
c
h 'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merge branch 'a
g
/patch
-
heade
r
-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
m
a
no
Me
r
ge branch 'jc/confli
c
t-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge branch 'ag/maint-
a
p
p
ly-to
o
-large-p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge branch 'ap
/
merge-backe
n
d-opt
s
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merge branch 'nd/
s
t
atus-p
a
rt
i
a
l
-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C H
a
mano
Merge remote branc
h
'remotes/trast-doc/for-
n
e
x
t'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merge branch
'jh
/
notes' (ea
r
ly part)
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Mer
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
M
erge branc
h
'jc/ma
i
nt-
r
efresh
-
index-i
s
-
o
p
tional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
M
erg
e
b
r
anch 'r
r
/core-t
u
t
o
r
ial'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Ha
m
a
no
Merge br
a
nch 'jc/cach
e
-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
Merge
branc
h
'js/exec-error-r
e
port'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Merge
branch 'jc/ls-
f
iles-ignor
e
d-
p
athsp
e
c'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
M
e
rge
b
ranch 'jc/gre
p
-lookahead
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
ama
n
o
Mer
g
e branch 'jc/main
t
-strbuf-add-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
an
c
h 'mm/conflict-adv
i
ce'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge
branch 'da/difft
o
ol
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branc
h
'
mh/rebase-fix
u
p
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Me
r
ge bran
c
h 'ns/rebase-auto-squa
s
h'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge br
a
nch 'mh/rebase-fi
x
up' (early
part)
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Me
r
ge
b
ranch
'
il/push-set-upst
r
eam
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hama
n
o
Me
r
ge branch 'jk/warn-auth
o
r-committer-aft
e
r-commi
t
'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io
C
Hamano
Merge branch 'j
c
/ident'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
amano
Merge branch
'
t
r
/http
-
p
u
sh-ref-statu
s
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'bk/fix-relative-g
i
t
dir-file'
commit
|
commitdiff
|
tree
2010-01-20
J
uni
o
C
Ha
m
ano
M
erge branch 'sd/c
d
-p-show-
t
o
p
l
evel'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C Hamano
Merg
e
b
ranch '
j
c/symb
o
l-static'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
ano
da
t
e
.
c
:
mark f
i
le-l
o
cal funct
i
on st
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Sync
w
i
t
h
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Gi
t
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C Hamano
Merge branch 'b
g
/m
a
int-r
e
mote-u
p
d
a
te-defaul
t
' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Haman
o
Merge branch 'sb/maint
-
oct
o
pus' into
m
aint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
M
e
rge bran
c
h
'bg/maint-
a
dd-all-d
o
c
'
into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Merge br
a
nch 'maint-1
.
6
.
5' into mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Me
r
ge bran
c
h 'jk/maint-1
.
6
.
5-
r
eset-hard'
i
nto
main
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'
tr/maint-1
.
6
.
5
-
bash
-
prompt-show
-
submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hama
n
o
M
e
rge branch 'dp/m
a
int-1
.
6
.
5-fa
s
t
-
import-
n
on-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
M
e
rge branch 'jm/maint-1
.
6
.
5-g
r
ep-NUL-termin
a
te' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Fix "checkout A
.
.
.
"
synonym
f
or "checkout A
.
.
.
H
E
A
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Ha
m
ano
st
a
tus: don't re
q
uire
the repository t
o
be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Joha
n
nes Sixt
Makefile: honor NO
_
CURL w
h
en
setting REMOTE_CURL_*
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Tarmigan Casebolt
id
e
nt
.
c: replace fp
r
intf wit
h
fputs to suppress compi
l
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
N
g
uyễn Thái Ngọc Duy
rm: only refresh e
n
t
ries that we m
a
y
touch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
David Ripton
bisect: fix singular/plural
gra
m
m
a
r
n
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben
Walto
n
cv
s
impor
t
: standarize syste
m
() calls to exte
r
nal git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsi
m
por
t
: s
t
a
ndarize open() c
a
lls to
external g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
c
v
simpor
t
: mod
e
rnize
c
allout
s
to git subcomman
d
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o C Hamano
Merge b
r
anc
h
'maint-1
.
6
.
4' into main
t
-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Mer
g
e branch 'main
t
-1
.
6
.
3' into ma
i
n
t
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hama
n
o
M
erge branc
h
'main
t
-1
.
6
.
2' into maint
-
1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge commit 'v1
.
6
.
4
.
4-8-g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
io C Hamano
Fix mis-backp
o
rt
o
f
t7002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Update
d
r
a
ft re
l
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 Hamano
Merge branch
'
main
t
'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Update d
r
aft release no
t
es
t
o 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge branch '
d
p
/ma
i
nt-1
.
6
.
5-fast-import-non-
c
ommit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio
C
Hamano
Merge branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
M
erge branch 'pc/unint
e
restin
g
-submodule
-
disap
p
ear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
rge
branch 'nd/in
c
lude-t
e
rmios-f
o
r-osol
'
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio
C
Ham
a
no
M
erg
e
branch
'js
/
w
in
d
ows'
commit
|
commitdiff
|
tree
2010-01-19
Andreas Gr
u
e
nbac
h
e
r
bu
i
ltin-apply
.
c
:
f
ix th
e
--- and
+++ header filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
a
niel Bark
a
low
R
e
place parse
_
blob
(
) with
a
n ex
p
lanatory comme
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
amano
Merge branch 'j
m
/maint-1
.
6
.
5-
g
r
e
p
-
NUL-terminate'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim M
e
y
e
ri
n
g
grep: NUL ter
m
inate input from a
f
i
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andreas
G
ruen
b
acher
b
u
i
l
tin-apply
.
c:
S
ki
p
f
ilenames
w
it
h
o
u
t enough comp
o
nent
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C H
a
mano
symlink
s
.
c: remov
e
unused
f
unctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
object
.
c:
r
emov
e
unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ham
a
no
D
ocument t
h
at merge s
t
rategi
e
s
c
an now
t
ake their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Aver
y
Pen
n
arun
Exten
d
merge-subtree tests
t
o te
s
t -Xsubtree=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Make "subtr
e
e"
p
art more orthogonal
t
o the rest
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next