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 virtual_id
2008-09-05
Mi
k
los Vajna
me
r
ge-re
c
urs
i
v
e: get
r
id
of virtual_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajna
merge-recursive:
move cu
r
r
e
n
t
_{file,dir
e
ctory}_set
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajna
merge-r
e
cursive: move the
g
loba
l
ob
u
f
to st
r
uct m
e
rge_options
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
na
merge-recursive: get r
i
d
of the index_only global variable
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
me
r
g
e
-recursiv
e
: m
o
ve call_depth to struc
t
merge_options
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
V
ajna
cherry-pi
c
k/r
e
v
e
rt: make direc
t
i
n
t
e
rnal call to me
r
g
e
_
t
ree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vajna
builtin-merge: avo
i
d run_
c
o
mmand_
v
_o
p
t()
f
or recursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
merge-recursive:
i
n
t
roduce merg
e
_options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
S
tephan B
e
yer
m
e
rge-recursive
.
c: Add more generic merge_rec
u
rs
i
ve_generic()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s
Vajna
Split out me
r
ge_recurs
i
ve() to
me
r
ge-recu
r
sive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
u
nio C
H
amano
Merg
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
g
i
tatt
r
ibutes: -crl
f
is not bin
a
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Hamano
git-a
p
ply:
Loosen "mat
c
h
_
begi
n
n
in
g
" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Juni
o
C
H
a
m
ano
F
ix example in git-name-
r
e
v
documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
Hamano
Mer
g
e branch 'sp/missing
-
thin-base' into m
a
int
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
Haman
o
Merge branch 'sb
/
daemon
'
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
M
erge br
a
nch 'af/ma
i
nt-install-no-handlin
k
' into
maint
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Hamano
shell: do
not
pla
y
duplicated definition
g
ames to shrin
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Al
e
x Riesen
Fix use
o
f har
d
li
n
ks in "make in
s
tall
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Hamano
Merge branch 'np/verify-pack' into maint
commit
|
commitdiff
|
tree
2008-08-29
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-29
T
o
r Arv
i
d
L
u
nd
git-p4: Fi
x
c
h
eckout bug when using --import-local
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo
C
iarrocchi
tutorial: gentl
e
r illustration
of Alice/Bo
b
wo
r
kflow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Jeff King
p
r
etty=format:
respect
dat
e
format o
p
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Bonzini
make git-s
h
ell
paranoid abo
u
t closed
s
tdin/
s
tdout/stderr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Yann
Dirson
Document gitk --argscmd flag
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Linus
T
o
r
valds
Fix
'
--dirs
t
a
t
' with cross-directory rena
m
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Björn Steinbrink
for-eac
h
-ref: Allow
a
trailing
s
lash in the patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
lex Riese
n
list_c
o
mmand
s
:
o
nly 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
A
le
x
Ri
e
se
n
Allow git he
l
p
work without PAT
H
set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
l
ex Rie
s
e
n
Make main
_
cmds and other_c
m
ds
local
to builtin-he
l
p
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
R
em
o
ve u
s
el
e
ss m
e
mset of st
a
ti
c
com
m
and name lists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remove
calculati
o
n of th
e
long
e
st command na
m
e fro
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Brandon Casey
dir
.
c: A
v
oid c
9
9
arr
a
y initi
a
lization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Matth
i
as Kestenhol
z
b
a
sh-completion: Add
all submodul
e
subcom
m
ands to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
Junio
C
Hamano
Merge
b
r
anch 'mv/m
e
rge-c
u
stom'
commit
|
commitdiff
|
tree
2008-08-28
J
un
i
o
C
H
a
mano
Mer
g
e branch 'ml/submodule'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
a
mano
Mer
g
e br
a
nch
'
am/cherry-pi
c
k
-
rerere
'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
i
o
C Ha
m
ano
Merge branch 'jc/add-ad
d
re
m
ove'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
ano
Merge
b
ranch 'np/ver
i
fy-pack'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Haman
o
Merge b
r
a
n
ch 'da/s
u
bmodule-
s
ync'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C Hamano
M
erge branch
'
maint'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
ctype
.
c: pr
o
te
c
t tiny C prep
r
oc
e
s
s
o
r
c
on
s
tants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
L
i
nus Torvalds
index-pack
:
be careful after fixing
u
p
t
h
e
header/footer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Simon Hausmann
Make
i
t
pos
s
ibl
e
to abort the submis
s
ion of a change
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
J
u
ni
o
C
Hamano
Merge
bran
c
h 'af/maint-install-no-han
d
link'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io
C H
a
mano
Merge
b
ranch '
j
c/no-s
l
im-shell'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C
Hamano
Me
r
ge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2008-08-27
Jef
f
K
ing
format-patch: use default diff f
o
rmat even with patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ng
u
yễn Thái Ngọc
D
u
y
inde
x
-pack: setup
g
it repo
s
itory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ram
s
ay Jo
n
es
S
uppress some
b
ash red
i
rection e
r
ror
mes
s
age
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jones
Fix a
w
arning (on cygwin) to allow
-Werror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
An
d
reas Färbe
r
M
akefile: alway
s
provide a fallback
w
hen
h
ardli
n
ks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C
H
ama
n
o
daemo
n
.
c: m
i
nor style 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
Davi
d
Agui
l
ar
g
i
t
-submodule: add "s
y
nc" comma
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
J
unio C Hamano
Revert "
B
ui
l
d-in "g
i
t
-
s
h
ell""
commit
|
commitdiff
|
tree
2008-08-25
J
e
f
f King
Fix "g
i
t log -i
-
-grep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
To
m
mi Virt
a
nen
Install git-shell in
b
i
n
dir, too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
u
ni
o
C Hamano
Me
r
ge bra
n
ch 'jc/
n
o-s
l
i
m
-
shell'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Me
r
ge bran
c
h
'
m
a
i
n
t
' to
s
y
nc 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 Hamano
Mer
g
e br
a
nch
'
ag/
m
ain
t
-combine-diff-fix' into maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Me
r
ge branch 'mv/ma
i
nt
-
me
r
ge-f
i
x' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2008-08-24
Mark Leveda
h
l
git-submodu
l
e - U
s
e "g
e
t
_
default_remote"
f
rom git-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jo
n
athan
N
iede
r
Documen
t
a
t
ion: clarify pager co
n
figur
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nieder
Documenta
t
ion: clari
f
y pager
.
<cm
d
> con
f
iguration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Simon H
a
usmann
Clean up
t
he git-p4 documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexander Gavrilo
v
Res
p
ect core
.
aut
o
crlf in combi
n
ed diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
os Vajna
Makefile: enable SNPRINTF_RET
U
RNS_BOGUS for HP-UX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
t760
6
: fix custom merge test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2008-08-24
Junio C
Hamano
m
erge: fix
n
umerus bugs arou
n
d "trivial merge" area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hamano
unpack_trees(): protect the
h
andcrafted in-core i
n
de
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
T
o
r Arvid Lund
gi
t
-p4: Fix
one-liner i
n
p4_
w
r
ite_pi
p
e function
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Da
v
id
Aguilar
git-subm
o
dule: rep
l
a
c
e duplic
a
ted code wit
h
a module_list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Nic
o
las Pitre
d
iscard rev
i
ndex data when pack
list changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan Hensgen
git-
m
erge documenta
t
i
on
:
more details about r
e
sol
v
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Alex R
i
esen
Extend "c
h
eckout --track" DWIM to support
m
ore cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
J
ona
t
h
an d
e
l Strother
Revert "Convert o
u
tput me
s
sages in merge-recursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Eric Raible
Completion: add
m
is
s
ing
'='
fo
r
'diff
--diff
-
filter
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
J
u
ni
o
C Hamano
temp
l
ates/M
a
kefile: i
n
stall
i
s unnecessa
r
y
,
just
u
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
B
r
andon Case
y
remot
e
.
c: add a function for deleting a
r
efspec
a
rray
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Joh
a
nnes Sixt
filter-br
a
nch: Grok special c
h
a
r
acters in tag na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jo
h
annes Schindelin
t
est-lib: do
n
o
t
rem
o
ve trash_directo
r
y if called
wit
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bonzi
n
i
pr
o
vide mor
e
errors for the "merge into
e
m
p
t
y head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Sha
w
n O
.
Pearce
M
ake reflog query '@{1219188291}'
a
c
t as '@{2008
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Neil Rob
e
rts
config
.
mak
.
in: Pass
o
n
LDF
L
AGS from confi
g
u
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mark Leved
a
hl
g
it-submodule
.
sh - Re
m
ove trailing
/
from URL if found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mik
l
os Vajna
Fix 'git help help
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
am
a
no
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2008-08-21
B
r
andon Casey
compat/snprintf
.
c: h
a
ndle
snprintf
'
s that alw
a
y
s return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herland
T
each "git diff -p" HTM
L
f
u
ncname patter
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kirill Smelkov
Teach "git diff -p" Python funcname patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
E
r
i
c
Wong
git
-
svn
:
f
i
x dcommit
t
o
u
rls wi
t
h embe
d
ded usernames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
b
r
a
nc
h
'ml/submodule-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hama
n
o
Me
r
ge
b
ranch 'pm/log-exit-c
o
d
e'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge b
r
anch 's
b
/commit-tree-mini
l
ea
k
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge
b
ranch 'pb/reflog
-
dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
H
amano
Merge
b
ranch 'jc/add-s
t
op-at-symlink'
commit
|
commitdiff
|
tree
2008-08-21
J
u
n
io
C
H
a
m
a
no
Merge branch 'k
h
/
d
iff-tree'
commit
|
commitdiff
|
tree
next