repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix overzealous cleanliness check in git-merge
2005-09-27
Junio C Hamano
F
ix overzealous cl
e
anliness check in git-
m
erge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-27
Junio C
Hamano
git-
c
lone: c
h
ec
k
o
u
t "m
a
ster
"
by
d
efa
u
lt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-26
Junio C Hamano
Plu
g
a small
r
a
ce in upd
a
t
e
-re
f
.
c
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Ham
a
no
Di
f
f
:
--name-status
o
u
t
put format
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Diff
:
-l<num> to
l
imit
re
n
am
e
/copy detection
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Haman
o
Diff
clean
-
up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio C Hamano
Merge bran
c
h 'fix
e
s
'
commit
|
commitdiff
|
tree
2005-09-25
Junio C
Hamano
Clean generated file
s
a
b
it more
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
Junio
C
Ha
m
ano
Stop installing the backward compati
b
le
s
ymli
n
ks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-25
J
u
nio C Hamano
show-bran
c
h: fix c
o
mmit naming breaka
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C Ha
m
a
n
o
git-grep: fix 'git grep -e $patter
n
'
handl
i
ng
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
u
nio C Hamano
Remove
u
se of 'xargs -0' fr
o
m git-reset
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
amano
U
s
e 0
.
99
.
7
.
GIT a
s
version between 0
.
9
9
.
7
and 0
.
99
.
8
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
J
unio
C
Hamano
So
l
aris: gi
v
e a bit more
b
uilt-
i
n defau
l
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
Hamano
Rea
l
ly ignore
g
enerated d
i
stribution m
a
terial
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio
C
Hamano
daemon
.
c: pid_t is not int
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
H
amano
Merge 'fix
e
s' branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-24
Junio C
Hamano
F
urther clarify
l
i
c
en
s
i
ng
s
tatu
s
of compat/sub
p
rocess
.
py
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hamano
Ig
n
o
re a
b
it more
g
e
nerated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
J
u
nio C Hamano
Merge branch 'fixes'
commit
|
commitdiff
|
tree
2005-09-23
Junio C Haman
o
M
ake 'git diff --cac
h
e
d' synonymous to 'g
i
t d
i
ff -
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Hama
n
o
Do not
gi
v
e alarming
error
message fr
o
m
rsyn
c
i
n
fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-23
Junio C Haman
o
Prettypr
i
nt octopus merge message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
J
uni
o
C H
a
mano
Ret
i
re
d
i
f
f-helper
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
J
u
n
io C Haman
o
Retire rev
-
tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-22
Junio
C
Hamano
R
e
tire git-e
x
port
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert
"
Use git-merge in
s
tead o
f
git-r
e
solve in gi
t
.
.
.
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Revert "Ma
k
e Octopus merg
e
m
e
ssage a bit
nicer
.
"
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C Ha
m
ano
Merge
b
ranch '
f
ixes'
commit
|
commitdiff
|
tree
2005-09-21
Juni
o
C
H
a
mano
Fix d
o
cumenta
t
ion
d
e
pen
d
ency
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio
C
H
a
mano
M
a
ke objec
t
creation
i
n http fetch a bit
s
a
fer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o
C
H
a
m
a
no
Clarify du
a
l
l
icens
e
status
of subp
r
ocess
.
py
f
il
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Junio C Hamano
Update tutorial with
Octopu
s
usage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
J
unio C Hamano
Make Octopus m
e
rg
e
message
a
b
it nicer
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-21
Jun
i
o C Hamano
Use g
i
t-merge instead of
git-resolve
i
n git-pull
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Do not give
a
larming error mes
s
a
ge fr
o
m rsyn
c
in
fetch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Ju
n
io
C
Hamano
S
h
o
w
modified files
i
n gi
t
-ls-fi
l
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Fast-
p
ath '
u
p
date-index
-
-
refre
s
h
'
a
b
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Ham
a
n
o
Use GECOS
field a bit b
e
tter to produce default human
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Jun
i
o
C
Hamano
Docu
m
ent -i fla
g
to git-read-tree
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
Ship our own
co
p
y
of subproc
e
ss
.
py
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-20
Junio C Hamano
show-branch: Be ni
c
e
r whe
n
r
unning in a corrupt repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C
Hamano
GIT 0
.
99
.
7
commit
|
commitdiff
|
tree
2005-09-18
J
u
nio C Ha
m
ano
Arrgh -- another ascii
d
oc ca
r
et workar
o
u
nd
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio
C Hamano
Document extend
e
d SHA1 used
b
y git-rev-parse
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Junio C Ha
m
ano
fetch() as
s
umes we do not have
t
he
object
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
Jun
i
o
C
Hamano
Merge branc
h
'master'
o
f
.
commit
|
commitdiff
|
tree
2005-09-18
J
un
i
o C Hamano
Improve the safety
c
heck used in fetch
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-18
J
unio C Hamano
Arch
i
ve-dest
r
oying "
g
it
repack -a -d" bug
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
D
o
not fail afte
r
calling
b
isect_auto
_
next()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Jun
i
o
C Hama
n
o
Fi
x
t
yp
o
i
n
test commen
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C
H
amano
[PATCH] getdomainname should be us
a
ble on
SunOS with
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio
C
Hama
n
o
Add git-s
e
nd-em
a
i
l
to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-17
Junio C Hamano
Teach rsync tra
n
sport about alt
e
rnat
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
[PAT
C
H] fe
t
ch
.
c: cleanups
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio C Hamano
[PATCH] Make
git-checkout
f
a
i
lure message
more friendly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Juni
o
C Hamano
Recommend 'le
s
s
'
for Debia
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-16
Junio
C
Hamano
Revert b
r
ea
k
age intr
o
duced
by
c
80522e30fdc190f8c8c7fc983bbe0
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Haman
o
Plug
di
f
f leaks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C
Hamano
A
v
oid wast
i
ng memory
while
k
eepi
n
g track
o
f
wh
a
t we
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
J
unio C Hama
n
o
Be more
b
ackward compatible w
i
t
h
g
it-ssh-{pus
h
,pull}
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Ha
m
ano
Unoptimize inf
o
/
ref
s
creation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio C Hamano
Retire info/rev-cac
h
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-15
Junio
C Hamano
git-branch -d <bran
c
h>: delete unused
bran
c
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
J
uni
o
C Hama
n
o
Re
v
ert
"[PATCH]
p
lug
memory
l
eak in diff
.
c::diff_free_filepa
.
.
.
commit
|
commitdiff
|
tree
2005-09-14
Junio C Hamano
Make merg
e
comm
e
nt git
-
pull makes for an o
c
t
opus a
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
J
unio C Hamano
Merge br
a
nc
h
'master' of
.
commit
|
commitdiff
|
tree
2005-09-14
Juni
o
C Ha
m
ano
rea
d
-tree: fix bogus
debugging st
a
tement
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-14
Junio
C Ha
m
ano
git-
m
erge-re
c
ursive: Tr
i
vi
a
l RE fixe
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
[P
A
T
C
H] Define relative
.
git/objects/info/alternates
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C H
a
mano
De
t
e
ct ls
-
r
emote failure properly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
amano
Fix
off-by-one error
in git-merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Ha
m
ano
Propag
a
te er
r
ors from fetch-pac
k
correctly
t
o git
-
fetch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
Juni
o
C Hamano
Fix CDP
A
TH problem
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C
H
amano
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Document git-grep and li
n
k it from the main git(7)
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
ni
o
C Hamano
[PAT
C
H
]
Make
'
git c
h
e
cko
u
t
' a bit m
o
re forgiving when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio
C Hamano
[PATCH
]
Omit patche
s
that
hav
e
a
l
rea
d
y b
e
e
n
m
erged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Allow fin
d
ing thin
g
s tha
t
begin
w
ith a
d
a
sh i
n
'git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Mer
g
e branch 'mast
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
U
se int instead
o
f
so
c
k
l
en_t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Prepare 0
.
9
9
.
7
release can
d
idate br
a
nch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C
H
amano
Add a new merge
s
trategy by Fredrik Kuivinen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C Hamano
'gi
t
-merge':
D
ocu
m
ent
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Use Daniel's read-tre
e
in the mer
g
e st
r
ategy 'resol
v
e'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Multi-backend me
r
ge
drive
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Ju
n
io
C
Hamano
Plug leak in Daniel's read-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Ju
n
io C Hamano
[
P
AT
C
H
] Add debugg
i
n
g
help f
o
r
c
ase
#
1
6
t
o re
a
d-tre
e
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
J
unio
C
Ham
a
no
[PATCH]
D
isable
d
e
b
ugging f
r
om read-
t
re
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
F
i
x 'g
i
t-show-branch --l
i
st
<head>'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C
H
a
m
ano
Add 'git bisect repl
a
y/log' do
c
umentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio
C Hamano
Keep bisectio
n
l
o
g
so that it can be rep
l
ay
e
d later
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
Junio C H
a
mano
Fi
x
copy marking from diffcore-rename
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-10
J
unio
C
Hamano
Make sur
e
we have
l
e
ading direc
t
orie
s
un
d
er refs/{he
a
d
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
H
a
m
ano
show-branch
:
--list and -
-
indepen
d
ent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
J
u
nio C Hamano
Retire support for old
e
nviro
n
ment variables
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
J
u
nio
C Ha
m
an
o
Adjust
.
gitignore for big renam
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Ha
m
ano
Ignor
e
dates
t
a
m
p-only changes w
h
en installing webdoc
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
H
amano
Sq
u
elch `removal' message from 'gi
t
res
e
t -
-
ha
r
d
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
'build
'
scripts bef
o
re installing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next