repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-add: no need for -f when resolving a conflict in already tracked path
2009-05-31
Jeff King
git-a
d
d:
n
o
n
e
e
d
for -f when resolving a
c
o
n
f
lict
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-31
Stephen Boyd
c
onfi
g
.
t
xt: document
a
dd
.
ignore
-
erro
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-31
S
Z
EDER Gábor
bas
h
: remove
always tru
e
if statement
from __git_ps
1
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-31
B
jörn
Steinb
r
ink
gi
t
-apply(1):
C
larify
t
hat
o
ne can
s
elect where to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-31
Cleme
n
s Buc
h
acher
h
t
tp-push:
reuse
existi
n
g is_null_r
e
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-31
Jun
i
o C Hamano
Merge gi
t
://g
i
t
.
b
o
gomips
.
org
/
git-sv
n
commit
|
commitdiff
|
tree
2009-05-31
Thomas Rast
Document
a
tion: te
a
ch
s
tash/
p
op workfl
o
w instea
d
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-29
Junio C Hamano
Merge branch 'sb/maint-1
.
6
.
2-opt-filename-fix'
commit
|
commitdiff
|
tree
2009-05-29
Junio C Hamano
Merge
b
r
anch '
j
c
/
maint
-
add-p
-
coalesce-f
i
x'
commit
|
commitdiff
|
tree
2009-05-29
Junio
C Hamano
Merge branch
'
r
s/
m
a
i
nt-g
r
ep-w
o
rd-regexp-fix'
commit
|
commitdiff
|
tree
2009-05-29
Stephen
B
oyd
t
9
120: don't e
x
pe
c
t fail
u
re with SVN_HTTPD_PORT un
s
et
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-29
Jun
i
o C Ham
a
no
Mer
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-05-28
Clemens Buchac
h
er
fix segfault showing an empty remote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-27
Steph
e
n Boyd
t5500: Modernize
t
e
s
t style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-27
J
u
nio C Hamano
completion: fix PS1 display during an AM on det
a
c
hed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-27
Benjamin Kramer
ima
p
-send: a
d
d
s
u
pport f
o
r
I
Pv6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-26
Junio
C H
a
ma
n
o
Up
d
ate draft
release notes to 1
.
6
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-26
Jun
i
o C Hamano
M
er
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-05-26
Junio C Hamano
Prepare for 1
.
6
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C Hamano
Merg
e
branch '
j
s/ma
i
nt
-
no-ln
-
acr
o
s
s
-libexec-and-bin
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio C Ham
a
no
Merg
e
branch '
l
t/maint-
d
iff-re
d
uce-l
s
tat' into maint
commit
|
commitdiff
|
tree
2009-05-26
J
unio C Ham
a
n
o
Merge branch 'jm/format-p
a
tch-no-auto-n-w
h
e
n
-
k-
i
s-
g
iven
.
.
.
commit
|
commitdiff
|
tree
2009-05-26
Junio
C
Hamano
Mer
g
e branch '
d
o/m
a
int-merge-rec
u
rsive-fix
'
into maint
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C Hamano
Me
r
ge branch 'jk/maint-1
.
6
.
0
-
trace-argv' into m
a
int
commit
|
commitdiff
|
tree
2009-05-26
Junio
C Ham
a
no
Merge branch 'np/push-delta' into maint
commit
|
commitdiff
|
tree
2009-05-26
Ju
n
io C
H
a
m
ano
Merge
b
ra
n
ch
'
ar/merge-one-fi
l
e-diag' into maint
commit
|
commitdiff
|
tree
2009-05-26
Junio
C Haman
o
Merge
br
a
nch 'ar/unli
n
k
-e
r
r'
int
o
maint
commit
|
commitdiff
|
tree
2009-05-26
Juni
o
C
H
amano
M
erge branch 'jk/maint-add-empt
y
' in
t
o maint
commit
|
commitdiff
|
tree
2009-05-25
Jeff
King
fix cat-f
i
le usage me
s
s
a
ge and documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
J
e
f
f
Kin
g
fetch: report
re
f
sto
r
age
D
F e
r
rors more
ac
c
urately
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Jeff Ki
n
g
l
o
ck
_
r
e
f: inform cal
l
ers o
f
una
v
ailable
ref
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Jeff Ki
n
g
convert bare readlink to s
t
rbuf_readlink
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Johannes Sixt
t37
0
1: en
s
ur
e
correctly
s
et up
r
epo
s
itory aft
e
r
s
kipped
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-25
Mich
a
el
J Gruber
merge-option
s
.
txt: Cla
r
ify merge --s
q
uash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-24
Junio C
H
a
mano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-05-24
Junio C Hamano
Merg
e
branch 'main
t
-
1
.
6
.
2' into
m
aint
commit
|
commitdiff
|
tree
2009-05-24
Junio C Haman
o
Mer
g
e
branch
'
maint-1
.
6
.
1'
into m
a
int-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-05-24
Ju
n
io C Hama
n
o
Mer
g
e
branch 'maint-1
.
6
.
0'
i
nto maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-05-24
Alex Rie
s
e
n
http-push
.
c::remove_
l
ock
s
(
)
:
fix use aft
e
r fr
e
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-24
Nguyễ
n
Thái Ngọc Duy
t/t
3
4
00-rebase
.
sh: add more tests to he
l
p mi
g
rating
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-23
René Scharfe
grep: fi
x
word-
r
egexp
a
t the beg
i
nnin
g
of lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-23
St
e
phen
Boyd
ap
p
ly, fmt-merge-m
s
g
:
use rel
a
t
i
ve filenames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-23
Step
h
en Boy
d
com
m
it:
-F overri
d
e
s -t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-23
Jim Meye
r
ing
post-r
e
ceive-email: ho
o
ks
.
sho
w
rev
:
s
h
ow how to include
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-23
Johannes Sc
h
indelin
MinGW: Fix c
o
mpiler warning
i
n merge-r
e
cursive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-23
Johannes Schi
n
delin
MinGW
:
Add a sim
p
le
g
e
tpass()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-23
Johann
e
s
Schi
n
delin
MinGW: use POSIX s
i
gnature of
w
aitpid()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-23
J
oha
n
nes
S
c
hinde
l
i
n
Min
G
W: the path se
p
arator to split
G
ITP
E
RLLIB is
'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-23
Peter
H
a
r
ris
MinGW: Scan for \r in addition to \n when rea
d
ing
shbang
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-23
Juni
o
C Hamano
Merge branch 'jn/gitweb-c
l
eanup'
commit
|
commitdiff
|
tree
2009-05-23
Ju
n
io C Ham
a
no
Merge
b
ranc
h
'
mg
/
track'
commit
|
commitdiff
|
tree
2009-05-23
Junio C Hamano
Merge
b
ranch 'fc/
d
ecorat
e
-tag
'
commit
|
commitdiff
|
tree
2009-05-23
Jun
i
o C
Hamano
Merge branch 'tp/s
e
n
d-email-
f
rom-config
'
commit
|
commitdiff
|
tree
2009-05-23
J
u
nio C Hama
n
o
Merge
branch 'js
/
maint-no-ln-across-libexec-and-
b
in'
commit
|
commitdiff
|
tree
2009-05-23
Junio C Hamano
Merge br
a
nch
'da/mer
g
etoo
l
-lib'
commit
|
commitdiff
|
tree
2009-05-23
Junio
C Hamano
Merge branch 'c
c
/bis
e
ct' (early
part)
commit
|
commitdiff
|
tree
2009-05-23
Junio C Hamano
Merge branch 'lt/maint
-
d
iff-reduc
e
-
l
stat'
commit
|
commitdiff
|
tree
2009-05-23
Junio C Ham
a
n
o
Merge bran
c
h 'jm/
f
ormat-p
a
tch-
n
o-auto-n-
w
hen-k-is-given'
commit
|
commitdiff
|
tree
2009-05-23
Junio C Ham
a
no
Merge
branch 'do/m
a
int
-
merge-recursive-fix'
commit
|
commitdiff
|
tree
2009-05-23
J
u
n
io C Hamano
Merge bra
n
ch 'rr/
f
o
rbid-bs-in-ref'
commit
|
commitdiff
|
tree
2009-05-23
Junio
C
Hamano
Me
r
ge b
r
anch 'hv/
s
ample-update'
commit
|
commitdiff
|
tree
2009-05-23
Junio C Hamano
Merge bra
n
ch 'jk/maint-1
.
6
.
0-
t
race-argv'
commit
|
commitdiff
|
tree
2009-05-23
Ju
n
io C H
a
m
a
no
M
e
rge
branch
'
jk/no-no-no-empty-direct
o
r
y
'
commit
|
commitdiff
|
tree
2009-05-23
J
u
nio
C
Hamano
Merge branch 'rs/grep-p
a
rseopt'
commit
|
commitdiff
|
tree
2009-05-23
J
unio C Hamano
Merge branch 'fl
/
git-
p
m'
commit
|
commitdiff
|
tree
2009-05-23
Junio C Haman
o
Merge br
a
nch
'
mt/submodule-reference'
commit
|
commitdiff
|
tree
2009-05-22
Jakub Narebsk
i
gitweb: San
i
tize ti
t
le attrib
u
te in format_
s
ubject_
h
tml
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
Nguyễn Thái Ngọc Du
y
T
e
rminate a
r
g
v
w
i
t
h
NULL b
e
f
o
re calling set
u
p_revisions()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
Nguyễn
T
hái Ng
ọ
c
D
u
y
doc/git
-
reb
a
se
.
t
x
t: remove menti
o
n o
f
mul
t
i
p
le str
a
t
egies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
Junio C Ha
m
ano
Merge git://
g
i
t
.
b
o
g
omips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-05-21
Eric W
.
B
i
ederm
a
n
git-se
n
d-email: Ha
n
d
l
e
quotes
when parsing
.
m
a
i
lrc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
Junio C Hamano
M
e
r
g
e
branch
'
maint
'
commit
|
commitdiff
|
tree
2009-05-21
René Scharfe
g
rep: fix w
o
rd-reg
e
xp colouring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
Giusepp
e
Bilotta
com
p
letion: use git rev-parse to det
e
ct bare repos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
Johan
n
es Schinde
l
i
n
Cope better wit
h
a _l
o
t
_
of packs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-21
René Scharf
e
grep: make ca
l
lback functions
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-20
Jeff King
for-each-re
f
:
fix segfault
i
n copy_email
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-20
Heiko Voig
t
E
x
tend sa
m
pl
e
pre-com
m
i
t
hook to check for non ascii
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-20
Dan McGee
Un
i
fy signedness
i
n hashing
c
a
l
ls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-18
Junio C Hamano
M
e
rge bra
n
ch 'np/p
u
sh-delta'
commit
|
commitdiff
|
tree
2009-05-18
J
u
nio C Hamano
Merge br
a
nch
'ar/m
e
rge-
o
ne-file-diag
'
commit
|
commitdiff
|
tree
2009-05-18
J
u
n
io
C
Hama
n
o
Mer
g
e
b
ranch 'ar
/
unlink-e
r
r'
commit
|
commitdiff
|
tree
2009-05-18
Junio C H
a
mano
Mer
g
e b
r
anch
'
jk/maint-a
d
d-
e
mpty
'
commit
|
commitdiff
|
tree
2009-05-18
J
u
nio C H
a
ma
n
o
Merge bra
n
ch
'j
s
/add-
e
di
t
'
commit
|
commitdiff
|
tree
2009-05-18
Junio C Hamano
Merge branch
'
mh/diff-stat-color'
commit
|
commitdiff
|
tree
2009-05-18
J
u
nio C Hamano
Merge branch '
m
h/
s
how-branch-color'
commit
|
commitdiff
|
tree
2009-05-18
Junio C Hamano
Merge
br
a
nch 'ac
/
grap
h
-horizontal
-
line
'
commit
|
commitdiff
|
tree
2009-05-18
Juni
o
C Hamano
M
erge branch 'ae/anon-fe
t
ch-inf
o
'
commit
|
commitdiff
|
tree
2009-05-18
Junio C Hamano
Merge b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2009-05-17
S
t
e
phe
n
Boyd
show
-
branch: F
i
x die message in
p
ars
e
_
refl
o
g
_param()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C H
a
mano
Merge
b
r
a
n
ch
'm
a
i
nt'
commit
|
commitdiff
|
tree
2009-05-17
Steph
e
n Boyd
co
m
pl
e
t
ion: add missing options to sho
w
-branch a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Linus Torvalds
d
i
r
.
c:
c
lea
n
up
h
andling
o
f 'path' parameter in rea
d
_directo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
D
an
McGee
Fix type-p
u
nning issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Ha
m
a
n
o
Merge bra
n
c
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2009-05-17
Nanako Shi
r
a
i
shi
test:
c
heckout s
h
ouldn't
s
ay that
H
EAD
has moved
if
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
completi
o
n
:
enhance "curren
t
bran
c
h" display
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Junio C Hamano
c
o
mpletion: si
m
pl
i
f
y
"cur
r
ent bra
n
ch" in __git
_
ps1
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
J
un
i
o C Hamano
c
o
mp
l
etion:
f
i
x
PS1 disp
l
ay during
a
merge on detach
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-05-17
Alex Riesen
Improve the n
a
ming of gu
e
s
s
ed target repository fo
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next