repo.or.cz
/
git
/
git-svn.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
o
s
V
a
jna
b
u
iltin-merge: re
l
ease the lockfile
i
n try_merge_strategy()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
l
o
s Vajna
merge-recursive:
g
e
t
ri
d
of virtual_id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vajna
merge
-
recursive: m
o
ve
c
urrent_{
f
ile,dire
c
t
ory}_
s
et
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
l
os Vajna
merge-rec
u
rs
i
ve: move the
globa
l
obuf to st
r
u
c
t
merge_options
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursi
v
e: get rid o
f
the i
n
dex_
o
nly global variable
commit
|
commitdiff
|
tree
2008-09-04
M
i
kl
o
s
V
a
j
na
me
r
ge
-
recursive: mo
v
e c
a
ll_
d
epth to stru
c
t
me
r
ge_options
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
Vajna
cherry-pi
c
k/reve
r
t: make direct internal call to m
e
rg
e
_tree()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
M
iklo
s
Vaj
n
a
bu
i
ltin-m
e
rge: avo
i
d run_command_v_opt() for rec
u
r
s
ive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
a
jna
m
e
rge-
r
ecursiv
e
: introduce m
e
rg
e
_o
p
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Stephan Beyer
merge-recurs
i
ve
.
c:
Add more generic
m
erge_
r
ecursive_g
e
neric()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
M
i
k
l
o
s
Vajna
Spli
t
out merge_recursive() to me
r
ge-recursive
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C
Hamano
gitattributes: -crlf
is not bi
n
ary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Hama
n
o
g
i
t
-apply: Loosen "match_begin
n
ing"
logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Fix exam
p
le in
git-name-rev
d
o
cumentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Hamano
Merge
b
ranc
h
'sp/missing-t
h
in-base' into maint
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o
C
Hamano
Merge bran
c
h
'
sb/d
a
emon
'
commit
|
commitdiff
|
tree
2008-08-30
J
unio C H
a
mano
M
e
rge branch '
a
f/maint-inst
a
ll-n
o
-handlink
'
i
n
to maint
commit
|
commitdiff
|
tree
2008-08-30
J
u
n
i
o C H
a
mano
shell: do
n
o
t play dupl
i
cated defin
i
t
ion ga
m
es to
s
h
r
ink
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Alex Riesen
F
ix use of hardlin
k
s in "mak
e
install"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Hamano
M
e
rge b
r
anch 'np/verify-pack'
into maint
commit
|
commitdiff
|
tree
2008-08-29
Juni
o
C
Ha
m
ano
Merge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-08-29
Tor A
r
vid Lund
git-p
4
:
Fix che
c
kout bu
g
w
h
en using --import-local
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Pa
o
lo Ciarroc
c
hi
tutor
i
al: ge
n
tler i
l
lustration of Alice/Bob wor
k
flow
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Jeff King
pre
t
ty=format: respect date format options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Pao
l
o Bo
n
z
i
ni
mak
e
git-she
l
l
parano
i
d about closed st
d
in
/
st
d
out/stderr
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Yann Dirson
Document
gitk --argscm
d
flag
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
L
inus
T
orv
a
lds
Fix '--dirstat
'
with cross
-
di
r
e
cto
r
y renami
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Björn
S
teinbrink
f
o
r-each-ref: Allow a trailing slash in the patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
A
lex
R
i
e
s
e
n
list_
c
ommands: only call
g
i
t
_e
x
ec_pat
h
i
f
i
t is n
e
eded
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Allow git help work wi
t
hout PATH set
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Make ma
i
n
_
cmds and oth
e
r
_c
m
ds local t
o
builtin-
h
elp
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remove usele
s
s
m
em
s
et of static
c
om
m
and name li
s
ts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
A
l
ex Ries
e
n
Remove calculation of the longest com
m
and
name
f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Brandon Casey
di
r
.
c:
A
vo
i
d c
9
9
a
r
ray initi
a
lizati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Matt
h
ias Kest
e
n
ho
l
z
bash-
c
ompletion: Add all submodule subcommands to the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-28
J
u
nio C Haman
o
Merge branch 'mv/merge-custom'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Ham
a
no
Mer
g
e branch
'ml/submod
u
le'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
i
o
C Ha
m
ano
M
e
r
g
e branch
'
a
m/c
h
err
y
-pick-rerer
e
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ham
a
no
Merge b
r
anch 'jc/add-add
r
e
m
o
v
e'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
ano
Merg
e
branch 'np
/
v
e
rify-pac
k
'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io
C
H
a
mano
Me
r
ge branch
'
da
/
su
b
module-
s
y
n
c'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C Hamano
ctype
.
c
:
protect tiny
C
prep
r
oce
s
sor co
n
stants
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Linu
s
Torvalds
inde
x
-pac
k
:
be
careful afte
r
fixing up the header/footer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Simon Hausmann
Make it
p
ossible to
a
b
o
rt
the submission
of a chan
g
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branc
h
'
af/maint-install-
n
o-han
d
link'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge
branch '
j
c/no-sli
m
-
s
hel
l
'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C Ham
a
no
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2008-08-27
Jeff King
format-patch: use default diff format 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
index-pack: se
t
up git rep
o
sitory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay
Jones
S
u
ppress some bash redirectio
n
error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
R
a
msay
Jones
F
i
x a warnin
g
(on cygwin) t
o
a
llow
-
We
r
r
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Andrea
s
F
ä
r
ber
Makefile: always pr
o
v
i
de a fa
l
lback when hardlinks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
J
uni
o
C Hamano
daemo
n
.
c: min
o
r
style fixu
p
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
git-s
u
b
modu
l
e: add "sync
"
command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
J
unio C
H
amano
Revert "Build
-
in "git-she
l
l""
commit
|
commitdiff
|
tree
2008-08-25
Jeff King
Fi
x
"git l
o
g -i --
g
rep"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
To
m
m
i Virta
n
en
Inst
a
ll git-shell
i
n
bindir,
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-sli
m
-shell'
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Ha
m
ano
Merg
e
branch 'm
a
int' 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
Junio C H
a
mano
Merge branch 'ag/maint
-
combine-di
f
f
-fix' into maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
M
erge branch
'mv/main
t
-
m
erge-fix
'
into
m
a
in
t
commit
|
commitdiff
|
tree
2008-08-24
M
ark Levedahl
git-submo
d
u
l
e
- U
s
e "ge
t
_
default_remote" from
git-parse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nieder
D
ocu
m
entation: clarify
p
ager configur
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan
N
ieder
Documentation: cl
a
rify pager
.
<cmd> confi
g
ura
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
S
i
m
on
H
a
usma
n
n
Clean up the git-p
4
doc
u
mentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Alexander Gavrilov
Respe
c
t core
.
aut
o
c
rl
f
in
c
ombined diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile: ena
b
le SNPRIN
T
F_RETURNS_BOGUS fo
r
HP-UX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C
H
amano
t7
6
06: f
i
x custom merge
t
e
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C Ham
a
n
o
Merge
branch 'm
a
int
'
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C Ham
a
no
me
r
ge: fi
x
nume
r
us bu
g
s
aro
u
n
d "trivial merge" are
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Hamano
unpack_trees()
:
protect the handcrafted in-core index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
To
r
Ar
v
i
d L
u
nd
gi
t
-p4: Fix one
-
line
r
in p4_wri
t
e_pipe fu
n
ction
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid Agu
i
l
a
r
git-submodule: replace dupli
c
ated co
d
e
w
i
th a m
o
dule_l
i
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Nicolas
Pitre
discard revindex data whe
n
pack list changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dan Hensgen
g
i
t
-
merge documentation:
m
ore
details about resolving
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Alex Ries
e
n
Extend "ch
e
ckout -
-
t
r
a
c
k" DWIM
t
o
support more cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Jona
t
h
an del S
t
rother
Revert "Convert output m
e
ss
a
g
es in merge-recursiv
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
E
r
ic
R
aible
Completion:
add
missing '='
f
or 'dif
f
--
d
if
f
-filter'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Hamano
templates/Makefi
l
e: in
s
tall i
s
unnecessary, just
u
se
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Brandon C
a
sey
r
emote
.
c: add a f
u
nction
f
or deleting a refspe
c
array
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Jo
h
a
nnes Sixt
filte
r
-b
r
a
nch: Gr
o
k
special charac
t
er
s
in tag names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Schindelin
t
est-lib
:
do not r
e
m
o
v
e
t
rash
_
d
i
r
ecto
r
y
if called with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Pa
o
lo
B
o
nzini
p
rovide mor
e
e
rrors
f
or th
e
"merge into empty he
a
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Shawn O
.
Pearce
Make re
f
log query '@{1219188
2
91}' 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
.
in: Pass on
L
DFLAGS from configure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Mark Levedah
l
git
-
sub
m
od
u
le
.
sh - Re
m
o
v
e
trailing / from URL if found
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
Vajna
F
i
x 'git help help'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
J
uni
o
C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
compat/snprintf
.
c:
h
an
d
le snprintf's that al
w
ay
s
return
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Jo
h
a
n
Herland
Teach "gi
t
diff -p" HTM
L
f
uncname patt
e
rns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Ki
r
il
l
Smelk
o
v
Teach
"
git diff -p" Py
t
h
on funcn
a
me patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Er
i
c Wong
git-svn: fix dcommi
t
to urls with em
b
edded user
n
ames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
Merge branch 'ml/submodule-
f
o
r
e
ach'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
M
e
rge branch 'pm
/
log-ex
i
t
-
code'
commit
|
commitdiff
|
tree
2008-08-21
J
un
i
o C Hamano
Merge branch 'sb/
c
ommit-tree-minileak'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C
H
ama
n
o
Merge branch 'pb/
r
e
f
log-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Me
r
ge
b
ranch 'jc/add-stop-a
t
-symlink'
commit
|
commitdiff
|
tree
next