repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
cherry-pick/revert: make direct internal call to merge_tree()
2008-09-03
M
i
k
l
os Vajna
cherry-pick/revert: mak
e
direct inter
n
a
l call to merge_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los V
a
jna
b
ui
l
t
i
n-merge: avoid run_co
m
mand_v_opt() for recursiv
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los V
a
j
n
a
merge-recursiv
e
: introduce merge_opti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Stephan Beyer
merg
e
-recursi
v
e
.
c: Add more g
e
neric merge_
r
ecursive_
g
eneric()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split
o
u
t
merg
e
_
r
e
cursive() to merge-recursive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
J
unio C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
g
itattributes: -crlf i
s
not binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
unio C Hamano
gi
t
-
a
pply
:
Loosen "match_beginning
"
lo
g
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
Hamano
Fix examp
l
e
i
n
git
-
name-rev docume
n
tation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio
C H
a
mano
M
e
rge
branch 'sp/missin
g
-
t
hin-base' into maint
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Ha
m
ano
Merge branch 'sb/
d
aem
o
n'
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Hamano
Merge branc
h
'af/
m
aint-ins
t
all-no-handlink' into maint
commit
|
commitdiff
|
tree
2008-08-30
Ju
n
io C H
a
mano
shell:
d
o
not p
l
ay duplicat
e
d
definition games
t
o shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Alex Rie
s
en
Fix use of har
d
links i
n
"make install"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hama
n
o
Merge branch 'np/veri
f
y-pack' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2008-08-29
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-29
Tor Arvi
d
L
u
nd
git
-
p4: Fix checkout
b
u
g whe
n
usi
n
g --import-local
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Ciarro
c
chi
tutorial:
gentle
r
i
l
l
ustration
o
f Ali
c
e/Bob workfl
o
w
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Jeff King
pretty=format: respect date
form
a
t o
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo
Bonzini
make
git-shell paranoi
d
about close
d
s
tdin/
s
tdo
u
t
/
s
t
derr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Yann Dirson
Doc
u
ment gitk --a
r
gscmd f
l
ag
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Linus Torvalds
Fix '--dirstat' with cross-dire
c
tory renam
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Björ
n
Stein
b
rink
fo
r
-e
a
ch-
r
ef: Allow a tra
i
ling
slash in t
h
e patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
lis
t
_comm
a
nds:
o
nly ca
l
l git_exec_path if it i
s
needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Allow
git help work
without PATH se
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Make main_cmds
a
nd other_c
m
ds local to
b
uiltin-
h
elp
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
l
e
x R
i
esen
Remove useless m
e
mset o
f
static command
n
ame lists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
R
emove calculati
o
n
o
f the longest command
n
ame fro
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Brandon Casey
dir
.
c: Avoid c
9
9 ar
r
ay in
i
tializ
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Matt
h
i
a
s Kestenholz
b
a
sh-comple
t
ion: Add all
s
u
bmo
d
ule
subcommands to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
J
u
n
io
C Hamano
Merge branc
h
'mv/merge
-
c
us
t
o
m
'
commit
|
commitdiff
|
tree
2008-08-28
Juni
o
C Hamano
Mer
g
e
branc
h
'm
l
/su
b
modu
l
e'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
M
e
r
g
e branch 'am/
c
herry-pick-rerere'
commit
|
commitdiff
|
tree
2008-08-27
J
unio
C Hamano
M
er
g
e
b
ranch 'jc/add-a
d
dremov
e
'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C Ha
m
ano
Merge b
r
anch 'np
/
verify-pack'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Mer
g
e branc
h
'da/submodule-
s
ync'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
Ha
m
ano
Merg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
i
o
C
Hamano
ctype
.
c: protect
t
iny C
preprocesso
r
cons
t
a
n
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
L
i
n
u
s Torval
d
s
index-p
a
ck: be care
f
ul a
f
ter fixing
u
p the heade
r
/footer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Simon Hausmann
Mak
e
i
t pos
s
ible to abort t
h
e
submission of
a change
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C
H
amano
M
e
rge
branch 'af/
m
aint-install-no-hand
l
ink'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Hamano
Merge branch 'jc/no-slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Jeff K
i
ng
format-patch: use default diff fo
r
mat even wit
h
patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
N
guyễn Thái Ngọc
Duy
index
-
pack: setup gi
t
repository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jon
e
s
Suppress some bas
h
re
d
irect
i
on error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Rams
a
y Jones
Fix a warning (on cygwin)
to a
l
l
ow -Werror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Andreas Färbe
r
Makefile
:
always provide a fallback wh
e
n
hard
l
i
nks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
daemo
n
.
c: minor styl
e
fix
u
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
D
avid Aguilar
git-submodule:
a
d
d
"sync" comma
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
Revert "Buil
d
-
i
n
"
git-s
h
e
ll
"
"
commit
|
commitdiff
|
tree
2008-08-25
Je
f
f Ki
n
g
Fi
x
"git log -i --grep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Tom
m
i Vi
r
tanen
Install git-shell
in bi
n
d
ir, too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge bran
c
h 'jc
/
no-s
l
im-shell
'
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Haman
o
Merge branch 'ma
i
nt' to s
y
n
c
with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio C Ham
a
n
o
GIT
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hama
n
o
Merge b
r
anch 'ag/maint-com
b
ine-
d
i
f
f-fix' into main
t
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io C Hamano
Merg
e
bra
n
ch 'mv/maint-m
e
rge-fi
x
' into
m
a
in
t
commit
|
commitdiff
|
tree
2008-08-24
Mark L
e
vedahl
g
i
t-submodule - Use "g
e
t_default_rem
o
te" from git-parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
o
nathan Ni
e
d
er
D
ocumentatio
n
: cla
r
ify pager conf
i
g
uration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nieder
Do
c
umen
t
a
t
io
n
:
c
l
arify pager
.
<cmd
>
configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Simon Hausmann
C
l
e
a
n
up t
h
e git-
p
4 documentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
A
l
exander G
a
v
r
ilov
Re
s
p
ect c
o
re
.
a
u
tocrlf in combine
d
diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
M
a
ke
f
ile: enable SNP
R
I
N
TF_RETURNS_BOGUS for HP-
U
X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C
H
amano
t7
6
06: f
i
x
cust
o
m m
e
rge test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
u
n
i
o C Hamano
M
erge
br
a
nch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ha
m
ano
merg
e
:
f
i
x
n
um
e
r
u
s b
u
g
s
aro
u
nd "tri
v
ial m
e
rg
e
"
a
rea
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ha
m
a
n
o
u
n
pack_tre
e
s(
)
:
p
rotect the
h
andcraf
t
ed in-core
index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Tor Arvid Lund
git-p4:
F
ix one
-
lin
e
r in p4
_
write_pipe f
u
nction
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d Agu
i
lar
git-sub
m
odule: replace duplica
t
e
d co
d
e
with a module_list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
N
i
colas
Pitre
discard rev
i
n
dex data when pack list changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan H
e
nsgen
git-merge doc
u
mentation: more detail
s
a
b
o
ut
r
esolving
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Alex
R
i
esen
Extend "check
o
u
t --track" DWIM to support
m
o
re cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
J
o
nathan del St
r
oth
e
r
Revert
"
Convert outp
u
t messa
g
es in merge-r
e
c
u
rsive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Eric
R
aible
C
o
mpletio
n
: add missing
'
=' for 'd
i
ff --diff-f
i
lte
r
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Hamano
tem
p
la
t
es/Makef
i
l
e: ins
t
all is unnecessar
y
, just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Brandon Casey
remote
.
c: add a function
f
or deleting a refspec array
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes
S
ix
t
filt
e
r
-
bra
n
ch: Gro
k
s
pec
i
al characters i
n
tag names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johan
n
e
s
Schindelin
test-lib: do
not r
e
move trash_direc
t
ory i
f
called with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
P
a
olo B
o
nzini
pr
o
vide more er
r
ors
f
or the "merge into empty head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Shawn O
.
Pearce
Make
reflog
q
uery '@{1
2
191882
9
1}' a
c
t as '@{2008
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Ne
i
l Robe
r
ts
config
.
mak
.
in: Pass on LDFLAGS
fro
m
c
onf
i
gure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mark Levedahl
git-submo
d
ul
e
.
sh - R
e
move trailing / from URL if found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mi
k
l
os
V
ajna
Fi
x
'git help help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
erg
e
branch
'maint
'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Cas
e
y
com
p
at/snprintf
.
c: h
a
ndle
s
npr
i
ntf's that alway
s
return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herlan
d
Teach
"g
i
t diff -p"
HTML funcn
a
me patt
e
rns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kir
i
ll Sm
e
lk
o
v
Teach "git diff -p" Python funcn
a
me patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Eric Wong
git-s
v
n: f
i
x
d
com
m
it to
u
rls w
i
t
h em
b
edded usernames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C H
a
mano
Merge branch 'ml/submod
u
le-foreac
h
'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Hamano
Merge br
a
nch
'p
m
/log-exi
t
-code'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
a
m
ano
Merge
b
ranch 'sb/commit-tree-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
Merge b
r
anc
h
'pb/reflog-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C Hamano
Merge branch
'j
c
/add-stop-
a
t-sym
l
i
nk'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Merge branch 'kh
/
d
iff-tree'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge bra
n
c
h
'
mg/c
o
unt-objects'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Me
r
g
e branch 'm
z
/push-verbos
e
'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Merge branch
'jc
/
i
ndex-exten
d
ed-flag
s
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge branch 'c
c
/merg
e
-base-many
'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Merge branch 'jc/t
e
st-deepe
r
'
commit
|
commitdiff
|
tree
next