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
Miklo
s
Vajn
a
merge-recu
r
s
ive: get rid of virtual_id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
merge-recurs
i
ve: move cur
r
ent
_
{fi
l
e,dir
e
ct
o
ry}_set
.
.
.
commit
|
commitdiff
|
tree
2008-09-05
Miklo
s
Vajna
merge-recursive: move the global obuf to
s
truct merge_o
p
tio
n
s
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajna
merge-recursi
v
e: get rid of the index
_
only global variab
l
e
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-r
e
cursive: move
c
a
ll_depth to s
t
ruct
m
erge_options
commit
|
commitdiff
|
tree
2008-09-03
M
i
kl
o
s
Vajna
c
herry-pick/
r
eve
r
t
:
make di
r
ect internal c
a
ll to merge_tree
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
buil
t
i
n-merge: a
v
oid run_command_v_opt()
f
o
r re
c
u
rsive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-recur
s
i
ve: introduce merge_op
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Stephan B
e
yer
merge
-
recursi
v
e
.
c: A
d
d
m
o
r
e
generic me
r
g
e
_rec
u
rsive_g
e
neric
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s
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
Junio C Ha
m
ano
Merge
bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
gi
t
attribu
t
e
s: -crlf is not binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
H
amano
git-apply: Loosen "matc
h
_
b
e
g
inning" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Fix example in
g
i
t-name
-
rev documen
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hama
n
o
Merg
e
bra
n
ch 'sp/m
i
ss
i
ng-thin-base' into ma
i
nt
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Hamano
Merge branch 'sb/daemon'
commit
|
commitdiff
|
tree
2008-08-30
J
u
n
io
C Hamano
M
er
g
e branch
'
af/maint-install-no-handlink' into maint
commit
|
commitdiff
|
tree
2008-08-30
J
unio
C Hamano
shell: do not play duplica
t
e
d
defini
t
i
on games to shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
A
l
ex Riesen
Fix
u
s
e of hardli
n
ks in "make in
s
ta
l
l"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
M
erge b
r
a
nch 'np/v
e
rify-pac
k
'
into maint
commit
|
commitdiff
|
tree
2008-08-29
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-08-29
Tor Arvid Lu
n
d
g
it-p4: Fix
checkout bug when using --import
-
l
ocal
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Ciar
r
occhi
tutorial: gentler ill
u
s
t
ration of
A
lice/Bob workflow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Jeff K
i
ng
pre
t
t
y=fo
r
mat:
r
e
s
pect dat
e
format options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
P
a
olo Bonzini
make git-s
h
e
l
l
para
n
oid
about cl
o
s
ed stdin/s
t
dout/
s
tderr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Yann Dir
s
on
Docu
m
ent
g
i
tk
-
-arg
s
c
m
d flag
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Linus Torvalds
F
i
x
'--dirs
t
at
'
w
ith cr
o
ss-directory
renaming
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
B
j
örn Stei
n
b
rink
for-each-ref:
Allo
w
a traili
n
g
s
l
ash i
n
th
e
pa
t
terns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
list_command
s
: o
n
ly call
git_
e
x
e
c_path
i
f it is nee
d
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
l
e
x
Riesen
Allow git help wo
r
k without
PATH set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Ale
x
Riesen
Mak
e
main_cmds
and other_cmds local t
o
builtin-help
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Rem
o
ve u
s
eless
m
emset of static
c
ommand name lists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remove
c
a
lculation of t
h
e longest
c
ommand name from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Brandon Casey
dir
.
c
: Avoid c99 a
r
r
ay initialization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Matthi
a
s
Kestenholz
bash-c
o
mpletion: Add all sub
m
odul
e
s
u
bcommands
t
o the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
Junio
C Ham
a
no
Merge branch 'mv/mer
g
e-custo
m
'
commit
|
commitdiff
|
tree
2008-08-28
J
u
nio C Hamano
Merg
e
branch 'ml
/
s
u
bmodule'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
M
e
rge branch 'am/che
r
ry-pick-rerer
e
'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
H
a
mano
Me
r
ge branch 'jc/add-addremove'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C
Ham
a
no
M
e
r
g
e b
r
an
c
h 'np/ver
i
fy-pack'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge b
r
an
c
h 'da/submodul
e
-syn
c
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge br
a
n
c
h '
m
aint'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C Hamano
ctyp
e
.
c: protect
tiny
C
preprocessor constants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Linus Torvalds
index-pac
k
: b
e
c
arefu
l
a
f
ter fi
x
i
ng
u
p the header/footer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Si
m
on Hausma
n
n
Make it po
s
sible to abort the subm
i
ssion of a ch
a
nge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Me
r
ge branch
'
af/maint-insta
l
l-no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
J
u
n
io
C Hamano
Merge branch 'jc/no-sli
m
-sh
e
l
l
'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
J
eff Ki
n
g
form
a
t
-pat
c
h: use
default
d
i
ff format e
v
e
n wi
t
h
p
atc
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
N
gu
y
ễn
Thái Ngọc D
u
y
index-pack: s
e
t
u
p
g
it re
p
o
sitory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ra
m
say
J
ones
Su
p
press some bash redirectio
n
error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
R
a
m
say Jones
Fix
a w
a
r
n
ing (on cygwin) to allow -Werror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
A
n
dre
a
s Färber
M
akefile: always provide
a
fa
l
lback when
hardlinks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
J
unio
C Hamano
daemon
.
c
: minor st
y
le
f
ixup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid Aguil
a
r
gi
t
-submod
u
le
:
add "sync" comman
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio
C
Hamano
R
e
ve
r
t "Buil
d
-in
"git-shell""
commit
|
commitdiff
|
tree
2008-08-25
J
eff King
Fix "git log -i --grep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
To
m
m
i
Virta
n
en
Install
git-shell in bindir, too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge branch 'jc/no-
s
lim-s
h
ell
'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Haman
o
Merge branch 'maint' to sync wi
t
h 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o 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
M
e
rge branch 'a
g
/maint
-
combine-
d
iff-fix' into
m
aint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge
b
ranch 'mv/m
a
int-me
r
ge-fix'
i
nto maint
commit
|
commitdiff
|
tree
2008-08-24
Mark Levedahl
git-submodule - Use
"ge
t
_default_
r
emote"
f
rom
git
-
pars
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nieder
Documentation: clar
i
f
y
pag
e
r config
u
r
ati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan N
i
eder
Documentation:
clari
f
y
page
r
.
<cmd> configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Simon Hausmann
Clean up t
h
e git-p4 documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexa
n
d
er
G
avrilov
Respect core
.
aut
o
crlf in combi
n
ed diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klos Vaj
n
a
Make
f
ile: enab
l
e SNPRINTF_RETURNS_BOGUS for HP-UX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C Hamano
t76
0
6:
f
ix custom merge
t
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C Hamano
Merge b
r
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
m
e
r
ge:
f
ix numerus b
u
gs around "trivial m
e
rge" a
r
e
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
u
npac
k
_trees(): protect the handcra
f
ted
in
-
cor
e
i
ndex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Tor
A
rvid Lund
g
it-p4: Fix one-li
n
e
r
in p4
_
write_p
i
pe functi
o
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
v
id Aguilar
git-submodul
e
: replace duplicate
d
code with a module_list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Nicolas Pit
r
e
discard revinde
x
dat
a
when p
a
c
k
list c
h
anges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan Hensg
e
n
git-merge docume
n
tation:
m
ore
details about resolving
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Ale
x
Riesen
Ex
t
end "checkout --track" DWIM to support m
o
re cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jonat
h
an
d
el Strother
Revert
"
C
o
nver
t
output m
e
ssages in merge-r
e
cur
s
ive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Eric Raible
Com
p
letion
:
add missing '=' for 'diff --
d
if
f
-filter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
J
unio C Hamano
te
m
plates/Makefile: ins
t
al
l
is unnecessary, just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Bran
d
on Casey
remote
.
c: add
a function for deleting a r
e
fspe
c
arr
a
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johan
n
e
s
S
ixt
filter
-
branc
h
: Grok special cha
r
acters in ta
g
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
J
o
h
ann
e
s Schin
d
e
l
in
t
e
st-
l
i
b
: do
not remove tra
s
h_dire
c
to
r
y
if
called with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bon
z
ini
provide m
o
re errors for the "merge in
t
o empty head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Shaw
n
O
.
Pearce
Make r
e
flo
g
q
uery
'@{1219188291}'
a
c
t as '@{2
0
08
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Neil Roberts
c
onfi
g
.
mak
.
in: Pass on LDFLA
G
S
f
rom configur
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
M
a
rk Levedahl
g
it-submodule
.
s
h
- Remove trailing / from
U
R
L
if found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Miklos V
a
jna
Fix 'git he
l
p help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
Mer
g
e branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2008-08-21
B
r
andon C
a
sey
compa
t
/snprint
f
.
c: h
a
ndle snprint
f
'
s
t
h
at
a
lways return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Joh
a
n
H
e
r
land
Teach "git diff -p"
H
T
ML funcname pat
t
erns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kir
i
ll Smelkov
Te
a
ch "g
i
t d
i
ff -p" Python funcname patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
E
r
ic Wo
n
g
git-
s
vn:
f
ix dc
o
mmi
t
to u
r
ls wit
h
emb
e
dde
d
usernames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
J
u
ni
o
C Hamano
Me
r
ge
b
ra
n
ch
'ml
/
submodule-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C
Hamano
Merge b
r
anch 'pm
/
l
o
g-exit-code'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o
C
Hamano
Merge bra
n
ch 'sb/commit-tree-
m
i
n
ileak
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch
'pb/reflo
g
-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merg
e
branch '
j
c/add-stop-at-s
y
m
l
i
nk'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Hamano
Merge branch
'kh
/
diff
-
t
r
ee'
commit
|
commitdiff
|
tree
next