repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin-merge: release the lockfile in try_merge_strategy()
2008-09-07
Mik
l
os Vaj
n
a
builtin
-
m
erge: release the lockf
i
le in tr
y
_merge_strat
e
gy()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
Vajna
m
erge-recursive
:
get rid of
virtual_i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
Va
j
n
a
merge-recursi
v
e: mo
v
e current_{
f
ile,direc
t
or
y
}_set
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
ajna
mer
g
e-recursive: m
o
ve the global obuf to struct me
r
g
e
_
o
ptions
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s V
a
jna
merge-recursive: get rid of the index_only global variable
commit
|
commitdiff
|
tree
2008-09-04
Mik
l
os Va
j
na
m
e
r
g
e-recursi
v
e: move call
_
depth
t
o
st
r
uct me
r
ge_options
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherry-pick/revert: make
d
irec
t
internal call to merge_tree()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-merge: avoid run_command_v_o
p
t() for
r
ecurs
i
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
M
ik
l
os Vaj
n
a
merge-recursive
:
introduce me
r
ge_option
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Stephan
B
ey
e
r
merge-recursive
.
c
:
A
dd mo
r
e generic merge_recu
r
sive_generic
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vajna
Split out merge_recursive() to
merge-re
c
ursive
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Haman
o
gitat
t
ributes: -cr
l
f
i
s
not binar
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io C Hamano
git
-
apply: Loosen "ma
t
ch_
b
eginning" l
o
gic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Hamano
Fix
e
xample
i
n gi
t
-name
-
r
ev documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branc
h
'
s
p/missing-thin-base'
into ma
i
nt
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ham
a
n
o
Merg
e
branch 'sb/daemo
n
'
commit
|
commitdiff
|
tree
2008-08-30
Junio
C Ha
m
ano
Mer
g
e b
r
anch
'af/mai
n
t
-
in
s
tall-no-hand
l
i
n
k
'
into maint
commit
|
commitdiff
|
tree
2008-08-30
J
unio
C Hamano
she
l
l: do n
o
t play duplicated definition ga
m
es to sh
r
ink
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Ale
x
Rie
s
en
Fix use of hard
l
i
n
ks in "make install"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
Hamano
Me
r
g
e
bran
c
h
'np/veri
f
y
-
pack'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2008-08-29
Junio
C
Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-08-29
Tor Arvid Lu
n
d
g
it-p4: Fix checkout bug when u
s
ing --imp
o
rt-local
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Pao
l
o Ciarr
o
c
c
hi
tutori
a
l: g
e
ntler illustrat
i
on of Al
i
ce/Bob workflow
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Jeff King
pretty=format: respect
d
a
t
e forma
t
options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
P
aolo
B
o
n
z
i
ni
make git-shel
l
paranoid abo
u
t
closed stdi
n
/std
o
ut/st
d
err
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Y
a
nn Dirson
D
ocument git
k
--
a
r
gscmd
flag
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
L
i
nus Torvalds
Fi
x
'--dirstat'
w
i
th c
r
oss-
d
ire
c
tory renamin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Björn
Stein
b
r
i
nk
for
-
each
-
ref: Allow a trailing slash in th
e
patte
r
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
A
lex
Rie
s
en
list_co
m
ma
n
ds: only call
g
it_e
x
ec
_
p
a
t
h if it is
needed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
A
lex Riesen
Allow git help w
o
rk w
i
thout PATH set
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
A
l
ex Riesen
Make mai
n
_
cm
d
s and other_cmds local to builtin-hel
p
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Re
m
ove useless mems
e
t
o
f sta
t
ic command name list
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex R
i
esen
Remov
e
calculation of the longest
command name fro
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Brandon Cas
e
y
dir
.
c: Avoid c99
array initialization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
M
a
t
t
h
i
as Kest
e
nho
l
z
b
a
s
h
-co
m
pl
e
t
i
on: Add all submodule subcomma
n
ds t
o
t
he
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-28
J
u
nio C
Hamano
M
erge branch '
m
v/merg
e
-
c
u
s
t
om'
commit
|
commitdiff
|
tree
2008-08-28
Juni
o
C Hamano
Merge
branch '
m
l/subm
o
dule
'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C Haman
o
Merge branch 'am/cherry-pic
k
-rer
e
re'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C
H
a
mano
Merge branc
h
'jc/add-add
r
e
move'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
mano
Merg
e
branch 'n
p
/ve
r
i
f
y-pack'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C Ha
m
ano
M
e
r
g
e
branc
h
'da/subm
o
dule-sy
n
c
'
commit
|
commitdiff
|
tree
2008-08-27
J
u
n
i
o C Hamano
M
e
rg
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C
Hamano
ctype
.
c: prot
e
ct tin
y
C preprocesso
r
co
n
st
a
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Linus
T
o
r
v
a
lds
index-pack: be careful afte
r
fixi
n
g up the
header/footer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Simon H
a
usmann
M
a
ke it po
s
si
b
le to
a
b
ort t
h
e submission of a change
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C Hamano
Me
r
ge branch 'af
/
maint-in
s
t
a
ll
-
no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Haman
o
Merg
e
branch 'jc/
n
o-slim-shel
l
'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Jef
f
King
format-patch: use def
a
ul
t
diff forma
t
ev
e
n with
patch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Nguy
ễ
n
Thái Ng
ọ
c Duy
ind
e
x-
p
ack: set
u
p git
r
epository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsa
y
Jon
e
s
S
u
ppress s
o
me bash red
i
rectio
n
error me
s
sages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jon
e
s
Fix a warn
i
n
g (on c
y
gwin) to allow -Werro
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Andreas Färber
Ma
k
efile: always
p
r
ovide a fallback wh
e
n hardlin
k
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
daemon
.
c: minor s
t
yle fi
x
up
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>:
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
g
it-
s
ubmodule: add "sy
n
c" command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Junio C H
a
mano
Rever
t
"Build-in
"
git-shell""
commit
|
commitdiff
|
tree
2008-08-25
Jeff
K
ing
Fix "git l
o
g
-
i --grep"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
T
o
mmi
V
irtanen
Install g
i
t-shell in bindi
r
,
too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C H
a
mano
Merge bran
c
h 'jc/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o
C
Hamano
M
erge branch
'maint' to sync with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Haman
o
M
erge
b
ranch 'ag/maint-
c
ombine-di
f
f-fix' in
t
o maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge br
a
n
ch 'mv/ma
i
nt-merge-fix
'
into maint
commit
|
commitdiff
|
tree
2008-08-24
Mark Le
v
edah
l
git-submodule
-
Use "get_default_remot
e
"
from git-parse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jo
n
athan Nieder
Docum
e
nta
t
i
o
n: clarify p
a
ger co
n
figuratio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
o
nathan Nieder
Doc
u
m
entation: clarify
pager
.
<
c
m
d
>
co
n
figu
r
atio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Simon Hausmann
C
l
ean up th
e
g
i
t-p
4
d
ocumentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Alexander Gavril
o
v
Respect core
.
au
t
ocrl
f
i
n
comb
i
n
e
d diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajn
a
Makefile: enable SNPRIN
T
F_RE
T
URNS_BOGUS f
o
r HP-UX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ha
m
ano
t760
6
: fix cus
t
o
m merge test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C
H
amano
merge: fix numerus bugs around "trivial merge" are
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Hamano
unpac
k
_trees
(
): protect th
e
handcraft
e
d in-core index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Tor Ar
v
id Lund
git-
p
4: F
i
x on
e
-liner in p4_writ
e
_pipe
func
t
ion
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
David
A
guilar
g
i
t-submodule:
r
eplace dupl
i
c
at
e
d co
d
e with a mod
u
le_l
i
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Nicolas Pitre
di
s
card revindex d
a
ta when pack li
s
t ch
a
nges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dan
H
en
s
gen
git-
m
erge d
o
cumentatio
n
:
more det
a
i
l
s about resol
v
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Alex Riesen
Extend "checkout --t
r
ack" DWIM to support
m
o
r
e cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Jonathan del
S
trother
Re
v
ert "Conv
e
rt output messages
in me
r
g
e-recursive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
E
ri
c
Raible
Completion: add missing
'
=
'
for 'dif
f
--diff-filter'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Junio C H
a
mano
templates/Makefi
l
e:
i
nstall is unnecessary,
just us
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Brandon
Casey
rem
o
te
.
c
: add a function for deleting a refspec array
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Sixt
fil
t
e
r
-branch:
G
rok sp
e
cial characters in tag
names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Schindelin
test-lib:
d
o not remo
v
e t
r
a
s
h_d
i
rec
t
ory if called
w
ith
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bonzini
provide
more er
r
ors for th
e
"merge into empty head
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Shawn
O
.
Pea
r
ce
Make reflog query
'
@{1219
1
88291}
'
act as '@{2008
.
8
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Neil Roberts
c
o
nfig
.
mak
.
i
n: Pa
s
s on LDFLAGS f
r
om configu
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Mark Levedahl
gi
t
-submodu
l
e
.
sh - Remove trailin
g
/ from URL
i
f f
o
und
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Va
j
na
Fi
x
'gi
t
he
l
p
help'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C
H
am
a
no
Merge bran
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-21
Brandon
C
asey
c
ompat/snpr
i
nt
f
.
c: handle s
n
printf
'
s that alw
a
ys
r
eturn
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herl
a
nd
Teach
"
git diff -p" HTML fun
c
name patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Kirill Smelkov
T
e
ach "git diff -
p
"
P
ython fu
n
cname pat
t
erns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
E
r
i
c
Wong
g
i
t-svn: fix dcommit to urls with
e
mbedded usernames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Mer
g
e branch 'ml/subm
o
du
l
e-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Ham
a
no
Merge branch 'pm/log-exit-code'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C
H
a
ma
n
o
Merge branch
'sb/commi
t
-
tr
e
e-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
a
no
Merge branch
'
pb/reflog-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge b
r
anch 'jc/add-sto
p
-at-symlink'
commit
|
commitdiff
|
tree
next