repo.or.cz
/
git
/
gitbuild.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: introduce merge_options
2008-08-31
Miklos
V
ajna
me
r
ge
-
recursive: introduce
m
e
rge_
o
p
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
S
tephan Be
y
er
merge-recursive
.
c
:
Ad
d
m
or
e
g
e
neric
merge_recursive_gene
r
i
c()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
S
p
li
t
out merge_recursi
v
e() to merg
e
-recursiv
e
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Jun
i
o C H
a
mano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2008-08-31
Junio C Hamano
gitattributes: -crlf is not binary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
g
i
t-apply:
L
oosen
"match_beginning" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
a
n
o
F
ix example in git-n
a
me-re
v
docume
n
tation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
Merge branch 'sp/missing-thin-ba
s
e
'
into mai
n
t
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ham
a
no
M
e
r
g
e
b
ra
n
ch 's
b
/
da
e
mon'
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
Merge branch '
a
f/
m
a
i
nt-i
n
stall-n
o
-
handlink' into maint
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
shell:
d
o not play duplica
t
ed
d
efinition games to shrink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Alex Rie
s
en
Fi
x
use
o
f h
a
rd
l
inks in "m
a
k
e
insta
l
l"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Hamano
Merge bran
c
h
'np/verify-pack' into maint
commit
|
commitdiff
|
tree
2008-08-29
Junio C Hamano
Me
r
ge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2008-08-29
Tor A
r
vid Lund
git-p4: F
i
x checkou
t
b
u
g
w
hen using --import-local
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
P
a
ol
o
Ciarrocchi
tutorial: gentl
e
r illustratio
n
of
Alice/
B
ob workflow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Je
f
f King
pretty=
f
o
rmat:
r
espect date format op
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paol
o
Bon
z
ini
m
a
ke gi
t
-shell paranoi
d
a
b
o
ut
cl
o
s
e
d std
i
n/stdou
t
/
s
t
derr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Ya
n
n Dirson
D
o
c
u
ment gitk
--a
r
gscm
d
flag
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Linus
T
orvalds
Fix '--dirst
a
t' wi
t
h
cro
s
s-d
i
rectory ren
a
min
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Björn Steinbrink
for-each-ref: Allo
w
a trailing slash
in th
e
patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
l
ist_commands:
o
nly call git_exec_path if it
is needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex R
i
es
e
n
Allow git he
l
p
wor
k
without
PATH set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
A
lex Riesen
Make main_
c
mds
a
nd
o
ther_
c
mds local t
o
built
i
n-help
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remove useless memset of sta
t
ic c
o
mmand name
lists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remove calcula
t
ion of the longest comm
a
nd name fro
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Br
a
ndon Cas
e
y
d
i
r
.
c: A
v
oid c99 ar
r
a
y
i
n
itialization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Matthias Keste
n
holz
bash-comple
t
ion: Add
a
ll
s
u
bmodule
subcommands to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
Ju
n
io C Ham
a
n
o
Merge branch 'mv/merge-c
u
s
tom'
commit
|
commitdiff
|
tree
2008-08-28
Junio
C Hamano
Merge branch 'ml/submo
d
u
l
e
'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
M
erge br
a
nch 'am/ch
e
rry-p
i
ck-re
r
e
r
e
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge
b
ranch 'jc/
a
dd-addr
e
move'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
M
erge branch 'np
/
verif
y
-pack'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C Haman
o
Merge br
a
nch
'
da
/
submo
d
u
l
e
-sync'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o
C Ha
m
ano
M
erge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
m
ano
cty
p
e
.
c: pro
t
ect tiny C preproc
e
ssor c
o
n
s
tant
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Linus Torvalds
ind
e
x
-
pack: be careful
after fixing up t
h
e he
a
d
e
r/footer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Simon Haus
m
ann
Ma
k
e it
possible to a
b
ort th
e
sub
m
ission
o
f
a
change
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C Hamano
Merge branch 'af/maint-install-no-hand
l
ink'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
H
amano
Me
r
ge branch 'jc/no-slim-
s
hell
'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
H
ama
n
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Jeff King
format-p
a
tch: use default diff for
m
at eve
n
w
i
t
h
patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ng
u
y
ễ
n
Thá
i
N
g
ọc D
u
y
index-pack: setu
p
git reposit
o
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ra
m
say Jo
n
e
s
Suppress some bash re
d
i
rection
e
r
ror messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ra
m
say Jones
F
ix a warning (on cygw
i
n) t
o
allow
-We
r
r
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
An
d
reas
F
ärber
Makefil
e
: alway
s
prov
i
de a
fallback when hardli
n
ks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ju
n
io C Hamano
da
e
mon
.
c: minor 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
Da
v
id Aguilar
git-submodule: add "s
y
nc" co
m
mand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
J
u
n
io C
H
a
mano
R
ev
e
rt
"
Build-in "git-
s
hell""
commit
|
commitdiff
|
tree
2008-08-25
J
eff Kin
g
Fix "g
i
t log
-i --grep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
T
ommi Virtanen
Install git-s
h
ell in bindir, too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Haman
o
Merge branch 'jc/no-s
l
im-sh
e
ll'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ha
m
ano
Merge branch 'maint' t
o
sync with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
GI
T
1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge
branch
'ag/maint-combine-
d
iff-fix' into maint
commit
|
commitdiff
|
tree
2008-08-24
J
u
nio
C H
a
mano
Merge branch 'mv/m
a
int-mer
g
e-fix' into
mai
n
t
commit
|
commitdiff
|
tree
2008-08-24
Mark Levedah
l
git-
s
ubm
o
dule - Use
"get_defau
l
t
_remote" fr
o
m g
i
t
-
parse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jo
n
ath
a
n Ni
e
der
Docum
e
n
tation: c
l
arify pager c
o
nfigur
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Nieder
D
o
cumentation: clar
i
fy page
r
.
<c
m
d> configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
S
imon Ha
u
smann
Clean up the gi
t
-
p
4 documenta
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexander
G
avrilov
Respect core
.
autocrlf in combined diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile:
e
nable SN
P
RINTF_RETURNS_BOGUS
for HP-UX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
unio C
Hamano
t7606
:
fix custom
m
erge
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Mer
g
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C Hamano
merge: fix numerus bugs around "tri
v
ial merge" ar
e
a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
unp
a
ck_tr
e
es(): pro
t
ect the han
d
crafted in-core
index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
To
r
Arvid Lun
d
git
-
p
4: Fix one-liner in p
4
_write
_
pipe function
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
David
Aguila
r
git
-
subm
o
d
u
l
e
: replace duplica
t
ed
c
ode with a module_list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Ni
c
o
l
as Pit
r
e
d
i
scard r
e
vindex data when p
a
ck
list changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan
Hensgen
git-merge documentation: mor
e
details about re
s
ol
v
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Alex Riesen
Extend "checkou
t
--trac
k
"
D
W
I
M to
s
upp
o
r
t more cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
J
o
nathan del S
t
rot
h
e
r
Revert "C
o
nvert ou
t
put mess
a
ges in m
e
rge-r
e
cursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
E
r
ic Raible
C
ompletion: ad
d
mis
s
i
n
g
'
='
for 'd
i
ff --d
i
ff-filt
e
r'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
J
u
nio C Hamano
templates/Makefile: i
n
stall is u
n
necessary,
j
u
st 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 refs
p
ec array
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johann
e
s Sixt
filter-branch: Grok special chara
c
t
e
rs in tag names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Schindelin
test-l
i
b: d
o
not
r
em
o
ve trash_directory if called with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paol
o
Bonzini
provid
e
more errors for t
h
e "merge into empty head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
S
h
a
w
n O
.
Pea
r
ce
Make r
e
f
log q
u
ery '@{12
1
91
8
8
2
91}' act as '@{2008
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Neil Roberts
c
onf
i
g
.
mak
.
i
n
: Pass on LDFLAGS from con
f
igure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mark Levedahl
gi
t
-submod
u
le
.
sh - Remove trailin
g
/ from URL
if found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
Vajn
a
Fix 'git
h
elp
h
elp'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C H
a
m
ano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-21
Bran
d
on Case
y
compat/sn
p
rint
f
.
c: handle sn
p
rintf's that always r
e
turn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Johan Herland
Teach "git diff -p" HTML fu
n
cname patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kirill Smelkov
Tea
c
h "git diff -p" Python funcn
a
me
p
a
tterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
E
ric
Wong
g
it-svn: fix
d
c
o
mmit to urls with e
m
bedded us
e
rnames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Hama
n
o
M
e
rge branch
'
ml/submodule-foreach
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Haman
o
Me
r
ge br
a
n
ch 'pm/log-ex
i
t-
c
ode'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
ma
n
o
Merge branch 'sb/commit-tree-minilea
k
'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e br
a
nch 'pb/reflog
-
dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ham
a
n
o
Me
r
ge branch 'jc/add-stop-at-
s
ymlink'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Haman
o
Merg
e
branch 'kh/di
f
f-tr
e
e
'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C Hamano
Merge branch 'mg/count-objects'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Mer
g
e branch 'm
z
/push-verbose'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
i
o
C Hamano
Merge branch 'jc/index-exten
d
e
d
-fl
a
gs'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C
Hamano
Merge
b
r
an
c
h 'cc
/
me
r
ge-ba
s
e-ma
n
y
'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io C Hamano
Merge bra
n
c
h
'jc/test-
d
eeper'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Ha
m
a
n
o
M
e
rg
e
b
ranch
'
js/parallel-test
'
commit
|
commitdiff
|
tree
2008-08-21
Mark L
e
vedahl
git-su
b
module
.
s
h
-
R
emove trailing /
from URL if found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next