repo.or.cz
/
git
/
kusma.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
xdl_merge(): fix and simplify conflict handling
2006-11-23
Eric
W
ong
git-sv
n
: error out from dcomm
i
t on a
par
e
nt-less commit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-23
René Scha
r
f
e
archive-zip
:
don't use sizeof(struct
.
.
.
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-23
Ju
n
io C Haman
o
GIT
1
.
4
.
4
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-23
Junio C
H
a
mano
t
r
ust-e
x
ecutable-b
i
t: fix
b
reak
a
ge f
o
r
symlinks
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-23
C
hris Riddoch
Mo
v
e --pretty opti
o
ns into Docum
e
ntatio
n
/pr
e
tty-fo
r
mats
.
txt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-22
Junio C Ham
a
no
Store peele
d
refs in packed
-
ref
s
(
take 2)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-22
Andy Parkins
Ad
d
s
up
p
o
rt to git-b
r
anch to show local and remote
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-22
Juni
o
C Hama
n
o
m
e
rge: allow merging into a yet-to-b
e
-born
br
a
n
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-22
Junio C Hama
n
o
git-merge: make i
t
usable as the first class
U
I
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-22
Junio C Hamano
remove merge-
r
e
cursive-old
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-22
Andy P
a
rkins
Im
p
rove gi
t
-prune -n ou
t
pu
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-22
Paolo Ciar
r
occhi
Doc: Make comment about
m
erging in tutor
i
al
.
txt m
o
re
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-22
M
i
c
h
al Rokos
archive: use setvbuf()
i
n
stead of s
e
t
line
b
uf()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-21
Jakub
N
arebski
git
w
eb: Fi
n
ish re
s
to
r
ing "blob" links
i
n git_difftree_body
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-21
Jakub Na
r
e
b
ski
gitweb:
R
efac
t
or fe
e
d generation,
make output
prettier
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-21
Jaku
b
Narebski
gitweb:
Add
an option to h
r
ef()
to r
e
tur
n
f
ul
l
URL
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-21
Jakub
Narebski
gitw
e
b: New
impr
o
ved formatting of
chunk header in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-21
Jakub Narebski
g
itweb: Defa
u
lt to $ha
s
h_b
a
se or HEAD for $hash in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-21
Jakub N
a
rebski
gitw
e
b: Buffer diff header
t
o
d
eal
with s
p
li
t
patches
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-21
J
akub Narebski
g
i
tweb: Protect a
g
ain
s
t po
s
s
ibl
e
warning
i
n git_
c
ommit
d
iff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-21
Nicolas Pitre
bui
l
tin git-s
h
ortlo
g
is broken
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-21
Johannes Schindelin
shortl
o
g
: fix "-n"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-21
Pao
l
o
Ciarrocchi
Te
a
ch Submitt
i
ngPatc
h
es
a
bout
git-commit -s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-20
Johannes
S
chind
e
lin
shor
t
log:
ha
n
d
l
e email addresses
c
as
e
-ins
e
nsitively
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-20
J
o
hannes Schindelin
shortlog: read
m
a
ilmap fro
m
.
/
.
m
a
ilmap again
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-20
Johannes Schindeli
n
shortlog:
d
o
n
ot
c
rash on
parsing "[
P
ATCH"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-20
J
o
hanne
s
Schindelin
Build
in shortlog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-20
J
uni
o
C H
a
mano
S
tore
p
eeled ref
s
in packed-refs file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-20
Junio C H
a
man
o
do
_
for
_
each_re
f
: perform the sa
m
e sanity check for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-20
Junio C
H
amano
git-fetch: fo
l
low l
i
ghtweit tags
a
s
well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-19
P
etr Baudis
Documentation: Correc
t
a
lternate
s
document
a
tion, docu
m
e
n
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-18
Petr Baudis
Docume
n
t
a
t
ion: Define sy
m
ref and update HEAD description
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-18
R
e
ne
S
charf
e
Document
g
it-r
u
nstatus
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-18
Rene Scharfe
g
it-apply
:
s
l
i
g
h
tly clean
up
bitfield
u
s
a
ge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-18
Rene Scha
r
fe
sparse fix: Using plain integer
as
NULL pointer
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-18
R
ene
Scharfe
spars
e
fix: non-ANSI functio
n
declaration
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-18
Petr Baudis
git-
a
pply: Documentation typo fi
x
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-18
Petr
Baudis
Fix git-for-e
a
c
h
-refs
b
r
oken for tags
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-17
Ju
n
i
o C Hamano
pack-objects: tweak "do
not ev
e
n
attempt delta" heuristics
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-17
Linus Torvalds
"git fmt-merge-msg" SIGSEGV
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-17
Linus Torv
a
l
ds
git
-
pull: allo
w
pu
l
ling into an empty repo
s
itory
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
Junio C Hamano
convert-objects: se
t
_XOPE
N
_S
O
URCE to 600
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
Jim Meyering
Run "gi
t
r
e
pack -
a
-d" once mor
e
a
t end, if there's
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
Alexan
d
re
J
ull
i
ard
g
i
tw
e
b: P
u
t back sh
o
r
t
log
in
s
t
ead of
graphiclo
g
in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
J
un
i
o C Hama
n
o
g
it-checkout:
a
llow pathspec
t
o recover lost working
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
Junio C Hamano
g
i
t-checkout: do
not a
l
low -f and -m
at the same t
i
me
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
J
o
hann
e
s
S
chi
n
delin
S
e
ek
b
a
ck
to curren
t
file
p
o
s w
h
en mmap()ing wi
t
h N
O
_M
M
AP
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
Ju
n
io C Hamano
a
p
ply --numst
a
t: ma
r
k
bina
r
y di
f
fstat with
- -, not 0 0
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-15
J
u
n
io
C Ham
a
no
GIT 1
.
4
.
4
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-13
Jun
i
o
C Ha
m
ano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2006-11-13
Robin
R
os
e
nberg
Rework c
v
sexportcommit to handle binary f
i
l
e
s f
o
r all
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-13
Johannes
S
ixt
Catch
errors when
w
riting a
n
ind
e
x that
c
o
n
tains inv
a
li
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-13
Johannes Sixt
test-
l
ib
.
sh: A command dying due to a signal i
s
an
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-13
J
onas Fon
s
ec
a
git-u
p
date-index
(
1): fix use
of quoting i
n
sec
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-12
J
unio C Hamano
GIT 1
.
4
.
4-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-12
J
u
nio
C
Hamano
M
erge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2006-11-12
Jun
i
o C
H
amano
git-cvsserver: read from
git wi
t
h -z to get non-ASCII
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-11
Junio C Hamano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-11
Jun
i
o
C
Hamano
p
a
th-
l
ist: fix path-list-insert
r
eturn value
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-10
Junio C
Hama
n
o
git-annotate: fix
-
S on gr
a
ft file with com
m
ents
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-10
Junio C
H
amano
git-annota
t
e:
n
o need to exec
blame; it is buil
t
-in
.
.
.
commit
|
commitdiff
|
tree
2006-11-09
Juni
o
C H
a
mano
M
erg
e
br
a
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2006-11-09
Robert S
h
e
a
rman
git
-
rebase: Use
--ignore-if-in-upstream option when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
Junio
C
Hamano
Document
a
t
ion: move blame
e
xampl
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-09
Eri
c
Wong
git-sv
n
: fix
d
commit losing ch
a
nges when o
u
t-o
f
-date
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
E
ric Won
g
git-svn: d
o
n't die on rebuild when --upg
r
ade is specified
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
E
r
ic Wong
git-svn: av
o
id printi
n
g
f
il
e
n
a
mes of files we're n
o
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
P
e
t
r
B
a
udis
Nicer error
message
s
i
n
case sa
v
ing an obj
e
ct to db
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
Ju
n
io C H
a
mano
gitw
e
b
:
f
i
x u
n
matched div in
c
om
m
itdiff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
Junio
C
Hamano
gitweb: protect commit
m
essages fr
o
m
c
ont
r
ols
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
J
u
nio C H
a
mano
g
itweb: protect blob
and d
i
ff
o
utput lin
e
s
f
rom co
n
t
rol
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-09
J
u
nio C Hamano
git
-
pickaxe: ret
i
re
p
ickaxe
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hama
n
o
M
e
rge
git://git
.
k
e
rnel
.
org/pu
b
/
scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-08
Junio C H
a
m
a
no
g
it-status:
q
uote LF in its output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
J
unio C Hamano
gitweb: do not gi
v
e
blame link unc
o
n
d
it
i
onal
l
y i
n
dif
f
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Jakub Narebski
g
itweb:
New
i
mproved pat
c
hset view
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Jaku
b
Nare
b
ski
g
i
tweb: Use
character or
octal esc
a
pe codes (and
a
dd
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
J
akub Narebski
git
w
eb
:
Better git-
u
nquot
i
ng and gitweb-q
u
oting
of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
J
u
nio C Hamano
gitweb: m
i
nimally fix "fork"
support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Junio C
H
amano
gitw
e
b: fix
disabling of "for
k
s"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Junio
C H
a
mano
G
IT 1
.
4
.
3-rc1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hamano
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2006-11-08
Junio C Ha
m
ano
Merge bran
c
h 'jc/pickaxe'
commit
|
commitdiff
|
tree
2006-11-08
J
unio C Hama
n
o
git-pickaxe: allow "-L <
s
omething>,+N"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-08
Nicolas Pitre
git-pack-o
b
jects
progress flag doc
u
mentation
a
nd cleanup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-07
Tero R
o
pone
n
remov
e
an u
n
n
e
eded t
e
st
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-07
Junio C Hamano
Merge branch 'jc/read
-
tree
'
commit
|
commitdiff
|
tree
2006-11-07
Junio C
Hamano
M
e
rge
b
ra
n
ch 'np/index-
p
ack'
commit
|
commitdiff
|
tree
2006-11-07
Junio C Hamano
M
e
rge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2006-11-07
Ju
n
io
C
H
amano
git-
p
ickaxe: -L /r
e
gexp
/
,/r
e
g
e
xp/
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-06
J
a
kub
N
arebski
D
ocumentation: Transplanting branch
with
git-rebase
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-06
Junio C Hamano
Document git-pack-refs and link
it to git(7)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-06
Alex Riesen
merge-recur
s
ive implicite
l
y d
e
p
e
nds on trust_executable_bit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-06
Juni
o
C Hamano
adjust_s
h
ared_perm: chmod() only when needed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-06
Jeff
K
i
n
g
Fix git-runst
a
tus for
r
epositories
containin
g
a fil
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pear
c
e
R
e
move m
o
r
e sed
i
n
v
o
c
ati
o
ns
f
r
om
w
it
h
in bash co
m
pletion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-05
Sha
w
n O
.
Pearce
Suppo
r
t bash completion on symmetric d
i
fference op
e
rator
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-05
Shaw
n
O
.
Pea
r
c
e
Take --git-dir into considera
t
ion during bash completion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-05
Shawn O
.
Pearce
Ba
s
h
completion
supp
o
rt for remotes in
.
g
i
t/
c
onfig
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next