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
Miklos V
a
j
na
me
r
g
e
-recursi
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-re
c
ursive: move current_{file,directory
}
_set
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive: move
the globa
l
obuf to
struct merge_opti
o
ns
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
e
r
g
e-re
c
urs
i
ve: get rid of the index_only global variable
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merg
e
-recursive: move cal
l
_depth to struct merge_options
commit
|
commitdiff
|
tree
2008-09-03
Miklos
Vaj
n
a
cherry-pick/revert: make direct intern
a
l call to
mer
g
e_tr
e
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
ajna
builtin-merge: avoid run
_
command_v_opt(
)
for
r
ecurs
i
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
M
iklos
V
ajna
merge-r
e
cursive: introduce merge_options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Stephan
Beyer
merge-recursi
v
e
.
c: Add m
o
re g
e
ner
i
c
merge_recursiv
e
_gene
r
ic()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajna
Split out merg
e
_recursi
v
e
(
)
t
o merge-r
e
cursive
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
i
o C H
a
mano
M
er
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io C Hamano
g
i
t
a
t
tribute
s
: -crlf
i
s not binary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
git-apply: Lo
o
se
n
"match_beginnin
g
" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C H
a
mano
F
i
x example
i
n
g
it-n
a
me-rev do
c
ument
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio
C Ha
m
ano
Merge
branch 'sp/missing-thin-ba
s
e' in
t
o maint
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge bran
c
h
'sb/daemon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
amano
M
erge
b
ranc
h
'af/maint-i
n
stall-no-handlink' into
maint
commit
|
commitdiff
|
tree
2008-08-30
J
un
i
o C Hamano
shell: do not play dupl
i
c
a
ted defi
n
iti
o
n ga
m
e
s to
shrink
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Alex Riesen
Fix use of hard
l
inks in "make install"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o
C
Ha
m
ano
Merge
b
ranch
'
np/
v
erify-p
a
ck' in
t
o m
a
int
commit
|
commitdiff
|
tree
2008-08-29
Jun
i
o C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2008-08-29
To
r
Arvid Lund
git-p
4
: Fix ch
e
ck
o
ut bug when using --
i
mpo
r
t-local
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Ciarrocchi
tu
t
or
i
al: gentler i
l
lustration of A
l
ice/Bo
b
wo
r
k
f
l
o
w
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Je
f
f King
p
retty=
f
ormat: r
e
s
pect
date format opt
i
ons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
P
a
olo B
o
nzini
make git-shell p
a
ranoi
d
about cl
o
sed
s
tdin/stdout/
s
tderr
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Yann
D
irson
Document gitk --argscmd f
l
a
g
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Linus
T
or
v
ald
s
Fix
'--dirst
a
t
'
with cross-directory
renaming
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Björn Steinbrink
for
-
e
a
ch-ref: Allow a trailing
slash in th
e
patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
list_commands: only call gi
t
_ex
e
c_path
if it is needed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
A
l
ex Riese
n
Allow git help work wi
t
hout PATH
s
et
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Ale
x
R
iesen
Make main_cmds and
o
t
h
er
_
cm
d
s loca
l
to b
u
iltin-h
e
lp
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remo
v
e usel
e
ss mems
e
t of sta
t
ic com
m
and n
a
me
lists
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remove calcul
a
tion of t
h
e l
o
ng
e
st c
o
mmand name from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Brandon C
a
sey
dir
.
c: Avoid c99 a
r
r
ay
i
nitialization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-29
Matthias Kestenholz
bash-
c
ompletion: Add all submodule subcommands t
o
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-28
Junio
C H
a
man
o
Me
r
ge bra
n
c
h 'mv/merge-cu
s
tom'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hama
n
o
Mer
g
e br
a
n
c
h '
m
l
/s
u
b
module'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C Hamano
Merge branch 'am/cherry-pick-rerere'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C Hamano
Merge b
r
anch 'jc/add-addremove'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
amano
Merge branch 'np/verify-pack'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C Hamano
Merge branch 'da/submodule-syn
c
'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C Hamano
M
erg
e
b
ran
c
h
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C
Hamano
c
t
ype
.
c: pr
o
te
c
t
t
iny C preproc
e
ssor constan
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Linus Torvalds
in
d
ex
-
p
a
c
k: be careful aft
e
r f
i
x
ing u
p
t
h
e header/foo
t
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Simon Hausmann
M
ake it possible t
o
abort the
s
u
bmissio
n
of a change
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-27
Junio C Haman
o
M
e
r
g
e branch
'a
f
/maint-install-no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
Me
r
g
e branch 'jc/no
-
slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Jeff Kin
g
forma
t
-patch: use defau
l
t dif
f
format
e
ven
w
i
t
h
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 repositor
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay
J
ones
Suppress some bash redire
c
tion
error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jones
F
ix a warn
i
ng (on cygwin
)
to allo
w
-Werror
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Andre
a
s
F
ärber
Makefile:
a
l
ways p
r
ovide a
f
allback when hardlinks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Junio C H
a
mano
daemon
.
c: minor
s
t
yle 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-submodule: add "sy
n
c" comm
a
nd
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-26
Junio C
H
ama
n
o
Revert
"
B
uild-in "git-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 Virtanen
I
n
s
tall git-shell in bi
n
dir
,
too
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
H
a
mano
Merge branch
'jc/no-slim
-
shell'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
H
a
m
ano
Merg
e
branch 'maint' to sync wit
h
1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio C H
a
mano
GIT 1
.
6
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o
C
Hamano
Merg
e
branch
'
ag/maint-combine-diff-fix' into m
a
int
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge branch 'mv/m
a
i
nt-merge-fix' i
n
to maint
commit
|
commitdiff
|
tree
2008-08-24
Mark Levedahl
git-submodule
- U
s
e "get_default_r
e
mote" from git-p
a
r
s
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nieder
Doc
u
men
t
at
i
on: clarify
page
r
configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
o
nathan
Nieder
Do
c
um
e
ntation
:
clarify pager
.
<cmd> conf
i
guration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Sim
o
n Hausman
n
Clean
u
p the
g
i
t-p
4
d
ocumen
t
a
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Alex
a
n
d
er Gavrilov
Res
p
ect
core
.
a
utocrlf
i
n
combined
diff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
o
s
V
ajna
Makefile:
enabl
e
SNPRINT
F
_RETURNS
_
BOGUS for
HP-UX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Hamano
t7606: fix cust
o
m merge test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C Hama
n
o
merge:
f
i
x
n
u
m
erus bugs around "trivial merge" area
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
un
p
ack_trees(
)
:
p
rote
c
t the h
a
n
d
crafted
in-core index
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Tor Arvid
Lund
git-p4: Fix one-line
r
in
p
4_write_pipe function
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Aguil
a
r
git-submodule: replace dupl
i
cated code wi
t
h
a
module_lis
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Nicolas Pitre
discard revindex
d
ata
when pack lis
t
chan
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
Dan Hensgen
git-
m
er
g
e documenta
t
ion: m
o
r
e
d
etails about resolving
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-23
A
lex Riesen
Extend "ch
e
ck
o
ut
-
-
tra
c
k" DWIM to
support
more cases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Jonathan del Strot
h
e
r
Revert "C
o
nvert outpu
t
messages in me
r
ge-recursive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Eric R
a
ible
Completion:
add missin
g
'=' for '
d
iff --diff-filter'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Junio
C Hamano
te
m
plates/Ma
k
efile
:
insta
l
l
i
s unnece
s
sary, j
u
st use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Brandon C
a
sey
r
emote
.
c: add
a
fun
c
tion for deleti
n
g a refspec array
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Jo
h
a
n
n
es Sixt
filter-branch: G
r
ok
special characters i
n
tag na
m
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
J
ohannes Schindelin
t
e
st-lib: d
o
not remo
v
e trash_directory
if c
a
lled
w
i
th
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
P
ao
l
o Bonzini
p
r
ovide more erro
r
s fo
r
the "merge into e
m
pty
head
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Sh
a
w
n O
.
Pearc
e
M
ake
reflog query
'
@{12191
8
8
2
91}' act as '@{2008
.
8
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Neil
Rob
e
r
t
s
co
n
fig
.
m
a
k
.
in: Pass on L
D
FLAGS from
c
onfigur
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Mark
Leved
a
hl
g
it
-
s
u
bmodul
e
.
sh - Remove tr
a
iling
/
f
rom URL if f
o
und
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-22
Miklo
s
Vajn
a
Fix 'g
i
t he
l
p help'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
Merge b
r
an
c
h '
m
aint'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Casey
compat/snprintf
.
c: handle
snp
r
intf's tha
t
always return
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
J
o
han Herland
Teach "git diff -p" HTML funcnam
e
patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Kir
i
ll Smelkov
Teach "
g
i
t
d
iff -p" Pyt
h
on funcname p
a
t
terns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Eric Wong
gi
t
-svn: fix dcommit to urls with embedded username
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
amano
Mer
g
e branch 'ml/
s
ubmo
d
ule-foreac
h
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'pm/log-ex
i
t
-code
'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C
Hamano
Merge br
a
nch
'
sb/commit-
t
ree-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
an
o
Merge b
r
anch
'
pb/reflog-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
e
rge
branc
h
'j
c
/a
d
d-stop-at-symlink'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Ha
m
a
no
M
e
rge branch 'kh
/
diff
-
tre
e
'
commit
|
commitdiff
|
tree
next