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
merge-recursive: get rid of the index_only global variable
2008-09-05
M
i
k
los Vajna
merge-recur
s
ive:
g
et
r
i
d
of the in
d
e
x
_only global variabl
e
commit
|
commitdiff
|
tree
2008-09-04
M
i
klos Vajna
merg
e
-recursive: move
c
all_de
p
th to struct mer
g
e_options
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherry-pick/revert
:
m
a
ke direct inte
r
nal call to mer
g
e_t
r
e
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
a
jna
builtin-
m
erge: avoid run
_
command_v_opt() for recursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vajna
mer
g
e-
r
ecurs
i
ve: i
n
t
roduce
m
e
r
ge_
o
ptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Steph
a
n Beyer
merge-
r
ecursive
.
c: Add
more generic merge_recursive_gene
r
ic
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Vajna
S
p
lit out merge_recursive() to mer
g
e-recur
s
ive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-31
Juni
o
C Ham
a
no
git
a
ttributes
:
-
c
r
lf
i
s not binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
Hamano
gi
t
-apply: L
o
ose
n
"
m
atch_beginni
n
g" log
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
Fi
x
ex
a
mple in git-name-rev docu
m
entation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Hamano
Merge b
r
a
n
c
h
'
s
p/
m
issing-th
i
n-base' into maint
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
Hama
n
o
Merge bran
c
h '
s
b/
d
aemon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branch 'af/maint-install-no-handl
i
nk' into ma
i
nt
commit
|
commitdiff
|
tree
2008-08-30
J
u
n
io C Hamano
she
l
l: do not pla
y
duplicated de
f
i
ni
t
i
on games to shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Alex R
i
e
sen
Fix use
o
f hardlinks in "make install"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Haman
o
Mer
g
e b
r
anch 'np/ver
i
fy-pack' in
t
o m
a
int
commit
|
commitdiff
|
tree
2008-08-29
J
un
i
o
C Hamano
Merg
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-08-29
Tor Arvid Lund
git-p4:
F
ix checko
u
t
b
ug w
h
en us
i
ng --import-local
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Cia
r
rocchi
tutorial: gentler
i
llustration o
f
Alice
/
Bob
w
orkflow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Jeff King
p
r
e
tty=form
a
t: res
p
ect d
a
t
e format
o
ptio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Bonzini
m
a
k
e git-sh
e
ll
par
a
noid about closed
s
tdin/st
d
out/stde
r
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Yan
n
D
i
rson
D
ocume
n
t git
k
--argscm
d
flag
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Linus Torvalds
Fix '--d
i
r
s
tat
'
with cross-directory re
n
aming
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Björn St
e
i
nbrink
f
o
r-each-ref:
A
l
l
ow a trailing slash in t
h
e p
a
tterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex
Riesen
l
ist_commands: only
call gi
t
_exec_path
if
i
t is needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x Riesen
A
l
low git
help w
o
rk w
i
t
ho
u
t PAT
H
set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Make main_cmds and
other_
c
mds
local to b
u
iltin
-
help
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex R
i
esen
Remove usel
e
ss memset o
f
s
tatic command name li
s
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x
R
ie
s
e
n
R
e
move calculatio
n
of
the
l
on
g
est c
o
mm
a
nd nam
e
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Bran
d
o
n
C
asey
dir
.
c
: Avoid c99 array ini
t
ializa
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
M
att
h
i
as Keste
n
holz
b
a
sh-completion: Add all submodule sub
c
ommands to
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
Junio C Ha
m
a
n
o
Merge
b
ranch 'mv/mer
g
e
-custom'
commit
|
commitdiff
|
tree
2008-08-28
Jun
i
o C Hamano
M
e
r
ge branch 'm
l
/submodule'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'am/cherry
-
p
i
ck
-
rerere'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C H
a
mano
Merge branch 'jc/add-addremove'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
Merge branch '
n
p/verify-pack'
commit
|
commitdiff
|
tree
2008-08-27
J
u
n
i
o C Hamano
M
e
rge
b
ranch 'da/submodule-syn
c
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
amano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
c
type
.
c: p
r
otec
t
tin
y
C preproce
s
sor c
o
nstants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Lin
u
s
Torva
l
ds
i
n
dex-pack:
b
e
careful after fixi
n
g up
t
he h
e
ader/footer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Si
m
on H
a
usmann
Make it po
s
sible
to abort the submission of a change
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C Ha
m
ano
Merge branch
'
a
f/maint-insta
l
l
-
n
o
-
handli
n
k'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Mer
g
e bra
n
ch 'jc/no-s
l
im-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
M
e
r
ge br
a
n
ch '
m
ain
t
'
commit
|
commitdiff
|
tree
2008-08-27
J
e
ff
Kin
g
format-p
a
t
ch: use
default
diff format
e
ven with patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Nguyễn Thái N
g
ọc Duy
ind
e
x-pack: setup git repos
i
tory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jones
S
u
p
p
ress some bash redirection error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay
Jones
Fix a war
n
in
g
(
on cygwin)
t
o allow
-Werror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
A
ndreas Färber
M
akefile: alwa
y
s provide a fallback when h
a
r
dlinks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
da
e
mon
.
c: min
o
r styl
e
fixup
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 Agu
i
lar
git-s
u
bmodu
l
e: add "sy
n
c" com
m
and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Ha
m
a
no
R
ever
t
"
B
uild-in
"
g
i
t-shell""
commit
|
commitdiff
|
tree
2008-08-25
Jeff King
Fix "git log
-i --grep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Tommi Vi
r
tanen
Install gi
t
-shell in bindir, too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C H
a
mano
Mer
g
e branch 'j
c
/
n
o-slim-shell
'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hamano
Merge br
a
n
c
h
'maint' t
o
sync
wi
t
h 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C H
a
mano
M
erge b
r
anch 'ag/maint-combin
e
-diff-fix'
int
o
maint
commit
|
commitdiff
|
tree
2008-08-24
J
unio
C
Hamano
M
e
rge
b
ranch
'
mv/
m
aint-merge-fix
'
into
ma
i
n
t
commit
|
commitdiff
|
tree
2008-08-24
M
ark Levedahl
git-submod
u
le - Use
"get_def
a
u
l
t_r
e
mote"
fr
o
m git-par
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nieder
D
ocume
n
tation: cla
r
i
f
y
pager c
o
nfiguratio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nieder
Doc
u
m
e
n
t
ation: clari
f
y
pager
.
<cmd> configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
S
i
mon Hau
s
mann
Clea
n
up
the
git-p4 documen
t
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexan
d
er Gav
r
ilov
Res
p
e
c
t cor
e
.
aut
o
crlf in c
o
mbined
diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klo
s
Vaj
n
a
Makefile:
e
nable SNPRINT
F
_
R
ETURN
S
_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
a
n
o
t
7
6
0
6:
fix
c
ustom merg
e
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hamano
Merge branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2008-08-24
J
u
n
i
o C H
a
mano
merge: fi
x
nume
r
u
s bugs aro
u
nd "triv
i
al me
r
g
e
" ar
e
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Hamano
unpack
_
t
r
ees(): protect the handcrafted in-c
o
re index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Tor
Arv
i
d L
u
n
d
git-p4: Fix one-li
n
er in
p
4_write
_
pipe
f
unction
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
g
i
t-sub
m
o
d
ule: re
p
lace du
p
licated code with a module_list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Nic
o
l
a
s Pitre
di
s
ca
r
d revindex d
a
ta when p
a
ck list changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan
H
ensgen
git
-
merge
docum
e
n
tation: more details about
r
esolving
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
A
le
x
Riesen
Exte
n
d "checkou
t
--track"
D
WIM to su
p
port more
c
ases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jonathan
d
e
l
Str
o
the
r
R
evert
"Convert outp
u
t messa
g
es in mer
g
e-recursiv
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Eric Raible
Completion:
a
dd missing
'
=' for 'diff --diff-filter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio C
H
amano
t
emplates/M
a
kef
i
le:
ins
t
all
i
s
unnecessar
y
, just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Brandon Casey
r
em
o
te
.
c: add a function for deleting a
r
efs
p
ec array
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Joh
a
n
n
e
s Sixt
f
i
lter-branch: Grok special char
a
cters
in ta
g
n
a
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes
Sch
i
ndelin
test-lib: do not r
e
m
ove trash
_
directory if called with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bonzini
pr
o
v
i
d
e
more errors for the "merge into empty
head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
S
h
awn O
.
Pearce
Mak
e
reflog query
'
@{121918
8
2
91
}
' act as '@{2008
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
N
e
il Robert
s
config
.
mak
.
i
n
: Pass
on LDFLAGS from co
n
figur
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mark Levedahl
git-submod
u
l
e
.
sh - Rem
o
ve tr
a
iling /
f
r
o
m
UR
L
if found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git hel
p
help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C
Ham
a
no
Merge
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-21
Brandon
Casey
c
omp
a
t/snprintf
.
c:
handl
e
snprin
t
f's
t
hat alw
a
y
s
r
eturn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herlan
d
Teach "git diff -p" HTML funcna
m
e patter
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kiril
l
Smel
k
ov
Teach "git diff -p" Pyth
o
n funcn
a
me
patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Er
i
c Wong
gi
t
-
s
v
n: fix
d
commit to urls with embedded use
r
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hamano
Merge branch 'ml/su
b
m
od
u
le-for
e
ach'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C Hamano
M
e
r
ge branch 'pm/log-exit-cod
e
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
a
m
ano
Merge branch '
s
b/
c
ommit-tree
-
minile
a
k
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
branch 'pb/reflog-
d
w
i
m'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Merge br
a
nc
h
'
jc/add-stop-at-symlink'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hama
n
o
Merge
branch 'kh/di
f
f-tre
e
'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hamano
M
erg
e
branch 'mg/count
-
obj
e
cts'
commit
|
commitdiff
|
tree
2008-08-21
J
u
n
i
o C H
a
mano
M
erge branch 'mz
/
push
-
v
erbose'
commit
|
commitdiff
|
tree
2008-08-21
J
u
n
i
o C Hamano
Merge branch 'jc/index-extended-flags
'
commit
|
commitdiff
|
tree
next