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
Support a merge with conflicting gitlink change
2007-12-11
Junio C Ham
a
no
Support
a mer
g
e wi
t
h confl
i
cting gitlink change
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-10
Junio C
Hamano
Upd
a
te dra
f
t Release
N
ote
s
for 1
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-10
W
i
ncent Col
a
iuta
Style
f
i
x
es for
p
re-
c
ommit
hook tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-10
W
i
ncent Colaiuta
Interacti
v
e ed
i
tor tests for commit-msg hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
Junio C Haman
o
Re-fix
ls-remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
Mike Hom
m
ey
Clea
n
up
v
ariables in
h
ttp
.
[ch]
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
Mike Hommey
git-send-email
.
perl: Really a
d
d a
n
gle
b
r
a
c
kets to In
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
Jeff King
don't men
t
ion index refreshi
n
g side
effect in git-stat
u
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
Nguyễn Thá
i
Ngọc Duy
Remove repo v
e
r
sion check
f
r
om set
u
p_git_dir
e
ctory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
J
unio C Haman
o
Merge br
a
n
c
h 'jc/sp
h
t
'
commit
|
commitdiff
|
tree
2007-12-09
Junio C Hamano
Merge branch '
p
r/m
e
r
geto
o
l'
commit
|
commitdiff
|
tree
2007-12-09
Junio C Ha
m
ano
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-12-09
Junio C Ha
m
ano
Re-f
i
x "builtin-commit:
fix
--signoff"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
W
i
ncent
Colaiuta
A
dd t
e
s
ts for pre-commi
t
a
n
d
co
m
mit-msg
h
ooks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
Junio C Hamano
Fix commit-msg
h
ook to allow editing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
Wincent Colai
u
ta
Doc
u
mentation
:
fi
x
--no-ve
r
ify doc
u
me
n
t
a
tion for "git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
W
i
n
c
e
n
t Colaiuta
Allow --no-v
e
rify to
bypass commit-
m
sg h
o
o
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-09
Junio C Ham
a
no
l
s-rem
o
te: res
u
rrect pattern limit su
p
port
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
Jim Meyering
config
.
c:store_write_pair(): don't r
e
ad
t
he by
t
e
b
efor
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
Junio
C Hamano
shortlog: code
r
estruct
u
r
ing and cl
e
an
-
up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
Junio
C
Hamano
mailmap:
fix bogus
f
or()
loop that happened to be saf
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
N
i
colas Pitre
pack-objec
t
s: fix threaded load b
a
lancing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
Nico
l
as Pitre
pack-objects: rev
e
rse the delt
a
searc
h
s
ort
l
ist
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
Ni
c
olas Pitre
p
a
ck-obj
e
cts: fix delta
c
ache size account
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
Jeff
K
i
ng
g
i
t-st
a
tus:
d
ocumenta
t
ion im
p
rovements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
Jeff King
add st
a
tus
.
relati
v
ePaths config variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
Jeff King
wt-status
.
c:quote_path()
:
c
o
nvert empty path to
"
.
/
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
J
unio C Hamano
g
it-bisect visualize: work
in non-windowed env
i
ronments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
Wincent Co
l
aiuta
Tea
c
h
"git a
d
d
-
i" t
o
colo
r
ize whitespace
errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-08
Sergei O
r
gano
v
L
e
t git-help prefer man-pages inst
a
l
led with this
v
ersion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-07
Junio C Hamano
Up
d
ate
d
r
a
ft rel
e
ase no
t
es to
1
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-07
Junio C H
a
m
ano
Merge bra
n
ch 'master' of gi
t
://repo
.
or
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2007-12-07
J
unio C Hamano
Merge b
r
an
c
h 'mw/cvsserv
e
r
'
commit
|
commitdiff
|
tree
2007-12-07
Ju
n
i
o C
H
amano
Merge bra
n
ch 'kh/
f
e
t
c
h-o
p
tpa
r
se'
commit
|
commitdiff
|
tree
2007-12-07
Junio
C
Hamano
Merge branc
h
'jc/git-log-doc'
commit
|
commitdiff
|
tree
2007-12-07
J
u
nio C Hamano
Merge branch
'jc/addi
-
color'
commit
|
commitdiff
|
tree
2007-12-07
J
unio C
H
amano
M
e
rge branch 'jc/docmake-pe
r
l'
commit
|
commitdiff
|
tree
2007-12-07
Junio
C H
a
man
o
Merge bran
c
h
'jc/
c
lean
-
fix'
commit
|
commitdiff
|
tree
2007-12-07
Jaku
b
Narebski
autoc
o
n
f: Add tes
t
for OL
D
_ICONV
(squelching compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-07
Wincent Colaiuta
Silence iconv warnings on Leopard
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-07
J
u
n
i
o C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-12-07
David
S
ymonds
Chan
g
e from usin
g
emai
l
.
com to exa
m
ple
.
com as exam
p
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
J
unio C Hamano
git-status documentation: mention
s
ubdirectory behaviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Junio C Hamano
do not di
s
card
statu
s
i
n f
e
tch_refs_via_pa
c
k()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Johannes
S
ixt
for
-
each-ref:
F
ix
quoting
s
tyle con
s
tants
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Junio C Hama
n
o
h
g-to-git:
h
andle a
n
emp
t
y
dir in hg
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Junio C Hamano
Use gitattributes to define
p
e
r-path whitespace rul
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Juni
o
C Hama
n
o
config --get-col
o
rbool:
diff
.
c
o
l
or is a
d
epre
c
ated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Jeff King
t7300:
add test for
c
lean with wildcard
pathspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Pini R
e
znik
Open
e
x
t
e
r
n
a
l
mer
g
e
t
ool
w
ith original file ext
e
nsions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
J
unio C Hamano
g
i
t-clean: Honor
pathspec
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Junio C Hamano
Col
o
r suppor
t
for "git-add -i"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Junio C
Hamano
git config -
-
g
e
t-colorb
o
ol
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
J
u
nio C
Hama
n
o
D
o
cumentation: co
l
or
.
*
= true means
"
auto
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Junio C Ha
m
a
no
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-12-06
Junio C Ha
m
ano
git-am -i: rep
o
rt rew
r
itten title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-06
Junio C Hamano
git grep shows the sa
m
e hi
t
repeatedly for u
n
merged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
Junio C Hamano
Merge bra
n
ch 'nd/maint-work-tre
e
-fix
'
into
main
t
commit
|
commitdiff
|
tree
2007-12-05
Ng
u
y
ễn Thái Ngọc Duy
Do
c
heck_repositor
y
_forma
t
() early (re
-
f
i
x)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
Junio
C
Ham
a
no
Re
v
e
r
t "git-
a
m: catch missing auth
o
r date early
.
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
Bj
ö
rn S
t
einbrink
git config: D
o
n't rel
y
on
regexec()
ret
u
rning 1 o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
Matt
h
ias Ke
s
ten
h
olz
Documentatio
n
: add --
p
atch
o
ption to synopsis of git-add
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
I
nclude
diff options in t
h
e git-log manpage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
J
u
nio C Hamano
git-cvsserver
r
uns hooks/p
o
s
t-update
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
Micha
e
l Wit
t
en
git-cvsserver runs ho
o
ks/post-
r
eceive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
Kristian Høgsberg
Rewrite bu
i
ltin-fe
t
ch opti
o
n p
a
rsing to
use parse_opti
o
ns()
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
P
a
scal O
b
ry
Set OLD_ICONV on
Cygwin
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
Junio C Hamano
t5510:
add a
bit more
t
ests for fetch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-05
Junio C Hamano
Merge
bran
c
h 'wc/add
-
i
'
commit
|
commitdiff
|
tree
2007-12-05
Junio C
H
amano
Merge
b
ran
c
h 'kh/com
m
i
t'
commit
|
commitdiff
|
tree
2007-12-05
Junio C Hamano
Merge
b
r
anch 'sp
/
refspec-
m
atch'
commit
|
commitdiff
|
tree
2007-12-04
Alex Riesen
Simpl
i
fy crud() in iden
t
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
H
.
Merijn Brand
Do not rely on the
e
xi
t
status of "unset" fo
r
unset
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
İsmail
D
önmez
gitweb: use Pe
r
l buil
t
-in utf8 function for UTF-8
d
ecoding
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Je
f
f King
t9600: require cvsps 2
.
1 to per
f
orm tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Jakub Narebski
contrib: Make remotes
2
c
onfig
.
sh script more robu
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Kristian Høgsber
g
Use a strbuf
for cop
y
ing the command line for the
r
e
f
log
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Junio C Hama
n
o
Documenta
t
i
o
n/git
.
txt: typof
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Junio C Haman
o
Documentat
i
on:
r
erere is
e
n
a
b
l
ed by default these days
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
J
unio C Hamano
Form
a
tti
n
g fix
f
or D
o
cumen
t
ati
o
n/g
i
t-
h
elp
.
tx
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
J
unio
C Hamano
Run the
speci
f
ied perl
in Documentation/
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
J
unio
C
H
a
m
a
n
o
Update dra
f
t
relea
s
e notes for 1
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Johannes S
c
hindelin
Allow ':/
<
oneline-prefix>' syntax to
w
o
r
k w
i
th save_commit_
b
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Ju
n
io C Hamano
Add git-f
a
st
-
export t
o
li
s
t of commands
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Johannes
S
chindeli
n
fast
-
e
x
port: rename the signed
tag
mode 'i
g
nore' to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
S
a
m Vilain
Add remote
.
<name>
.
proxy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Sam Vilain
A
llow H
T
TP proxy to b
e
overri
d
den in
c
onfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Chr
i
s
t
ian Couder
Trace and q
u
ote
w
i
t
h argv:
g
et rid of u
n
nee
d
ed count
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Robert Schiele
i
n
s
t
all-sh
from aut
o
m
a
ke does
n
ot like -m without
d
el
i
miting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-04
Christian Couder
Documentation: a
d
d a new man page fo
r
"gi
t
-
h
elp"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Ju
n
io C Haman
o
git-commi
t
docume
n
tation: fix unfinished
s
entence
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Wi
n
cent
Colaiuta
gi
t
-
add -i: add h
e
lp text for list-a
n
d
-
choose UI
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hamano
git-
c
ommit --allow-empty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Junio C Ha
m
an
o
git
-
commit --allow
-
empty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Johannes Sixt
g
i
t-
c
omm
i
t: Allo
w
t
o amend a
merge commit that
d
oes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Junio C Ha
m
a
n
o
gi
t
-
c
ommit: Al
l
ow
to amend a m
e
rg
e
c
o
mmit tha
t
doe
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Jeff Kin
g
quote_p
a
th: fix co
l
lapsin
g
o
f
r
e
lative paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
S
h
awn Boh
r
er
Make g
i
t status
u
sage s
a
y git status instead of git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hamano
F
ix --signo
f
f in builtin-com
m
i
t
differently
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2007-12-03
Junio C Hamano
Merge branch 'js/pru
n
e-e
x
pire'
commit
|
commitdiff
|
tree
next