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
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
2005-09-13
Junio C Hamano
Fix off-
b
y
-one
e
rror i
n
git-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
amano
Propagate errors from fetch-pack
c
orrectly
to git-fetch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C Ham
a
no
Fix CDPATH problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C Hamano
Document git-grep and li
n
k it f
r
om th
e
main
git(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
uni
o
C Hamano
[PA
T
CH
]
Make
'git checkout
'
a bit mo
r
e forgiving when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Ju
n
io C
Hamano
[
PATCH] Omit patches that hav
e
already been merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Ju
n
io
C
Hamano
Allow findi
n
g things that beg
i
n with a dash in 'git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Ha
m
an
o
Use int instead of
socklen_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
n
io C Hamano
Add a new merge strategy by Fredrik
Kuivi
n
en
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hama
n
o
'git-me
r
ge': Do
c
umentati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C Hamano
Use Daniel's read-
t
ree in the merge
strategy
'resolve
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Ju
n
io C
Hamano
Multi-backend me
r
ge
d
river
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
Hamano
Plug leak in Dan
i
el's
r
ead-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Juni
o
C
Hama
n
o
[PA
T
CH] Add
d
e
buggin
g
help for case
#
16 t
o
read-tree
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Haman
o
[PATC
H
] Disable debugging from read-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Fix 'git-show-branch --li
s
t <head>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio
C
Ha
m
ano
Ad
d
'git bi
s
ect replay/log' documentatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hama
n
o
Keep bisec
t
ion log
so tha
t
i
t
can be re
p
layed later
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Hama
n
o
Fix copy
m
a
rki
n
g
fr
o
m d
i
ffcor
e
-rena
m
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
J
u
nio C Hama
n
o
Make sure we have l
e
ading directories
un
d
er refs/{he
a
ds
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C
H
amano
show-bran
c
h: --lis
t
and --in
d
epe
n
d
e
n
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Retir
e
support for old environment varia
b
l
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io C Ha
m
ano
A
d
just
.
g
i
tign
o
re f
o
r big renam
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Juni
o
C Hamano
I
gnore da
t
estamp-on
l
y changes when inst
a
lli
n
g web
d
oc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
J
u
n
i
o
C Hamano
Squ
e
lch `removal'
me
s
sage from 'git reset --hard'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C H
a
mano
'bui
l
d' scri
p
ts before
i
nst
a
lling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
J
unio C H
a
mano
Sho
w
all merge-base
c
a
ndidate
s
from show-bran
c
h
--merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
D
o
cument
a
ti
o
n updat
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Ju
n
io C Hamano
git --version t
e
lls
w
hich version of git you have
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Ju
n
io
C Hamano
Big tool rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
GIT 0
.
9
9
.
6
commit
|
commitdiff
|
tree
2005-09-07
Junio C Haman
o
D
ocumentation upda
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hamano
Docum
e
n
t
ati
o
n up
d
ates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Ju
n
io
C
H
a
mano
Fl
a
t
t
en tools
/
dire
c
t
ory to make
b
u
ild proc
e
dure
s
imp
l
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Junio C Ha
m
ano
mai
l
i
n
fo: bar
f
and exist u
p
on
n
ested multipart
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Junio
C Hamano
Merge branch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-06
Ju
n
io C Hamano
F
orm
a
t fix for a
s
ciidoc document
a
tion titles
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
J
u
n
io C Hamano
Me
r
ge branch
'mas
t
e
r
'
o
f
.
commit
|
commitdiff
|
tree
2005-09-05
Jun
i
o
C
H
amano
Re
t
ire git-clone-dum
b
-htt
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Jun
i
o
C
Hamano
Install arc
h
imp
o
rt-script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
J
u
nio C Hamano
M
erge bra
n
ch 'master' of
.
commit
|
commitdiff
|
tree
2005-09-04
Junio C Hamano
Add copy/rename check for git-apply
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Ju
n
i
o C Hamano
Ad
d
a
l
ink from
update
-
server-info document
a
t
ion to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Haman
o
gi
t
-
applymbox: fix '-
c
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-03
Junio
C
Hamano
D
o
cument hooks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Ju
n
io C Hamano
Merg
e
bra
n
ch
'
master'
of
.
commit
|
commitdiff
|
tree
2005-09-02
Jun
i
o C Hama
n
o
Men
t
ion post-u
p
date when we first talk about pu
b
lishing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
J
u
n
io C H
a
mano
scripts: equality test '==' is not portab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Hamano
git-checkout
-
script:
R
e
move unnecessary va
r
iable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Ha
m
ano
Fix
a
utomerge me
s
s
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio C H
a
mano
Add repo
s
itory-layout document
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Juni
o
C Hamano
Merg
e
refs/heads/ma
s
ter from
.
commit
|
commitdiff
|
tree
2005-09-01
J
u
n
i
o C Ha
m
a
n
o
Use 'git status'
n
ow it can
h
andle in
i
tial commi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio C Ha
m
ano
Fix git-stat
u
s
w
hen
H
EAD is invalid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio
C Hamano
Fix gi
t
-log-script when H
E
AD is i
n
valid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio C Hamano
Add Pine 4
.
6
3
help from Daniel
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio C Hamano
Merge refs/he
a
ds/master from
.
commit
|
commitdiff
|
tree
2005-08-31
Jun
i
o
C Hamano
Update tutor
i
a
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Junio C
Hamano
sho
w
-
b
ranch: m
a
ke it wo
r
k in a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Juni
o
C Hamano
M
erge refs/heads/
m
aster fr
o
m
.
commit
|
commitdiff
|
tree
2005-08-30
Jun
i
o C Ha
m
ano
cat-file: make it work in a su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Juni
o
C Hamano
Docu
m
entaion updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Jun
i
o C Ha
m
ano
'
g
it bisect visualize'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
unio C Ham
a
no
Merge refs
/
he
a
ds/master
f
r
om
.
commit
|
commitdiff
|
tree
2005-08-30
Junio
C Hamano
p
ars
e
-remote: trivia
l
fix to all
o
w refs/{heads,tags
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Haman
o
Mer
g
e refs/heads/master
from paulus
commit
|
commitdiff
|
tree
2005-08-30
J
u
nio C Hamano
M
ake sure h
o
wto/*
.
html is built a
s
well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
unio C H
a
mano
Merge r
e
fs/heads/master from
.
commit
|
commitdiff
|
tree
2005-08-30
Junio C Hamano
Allow
a
sciidoc formatted docume
n
tation
i
n howto/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Ju
n
io C Hamano
M
e
rg
e
refs/heads/maste
r
from
.
commit
|
commitdiff
|
tree
2005-08-30
Junio C
Hamano
Add [H
O
WT
O
] revert/bra
n
ch/rebase
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
unio C Hamano
git commit: A
l
low edit
i
n
g
on al
l
occasi
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio
C
Hamano
Do
not verif
y
reverted/c
h
er
r
y-pic
k
ed
/
r
e
based patc
h
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
u
n
io
C
Hamano
Fix co
m
pilatio
n
warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Ju
n
io
C
Hamano
Me
r
ge ref
s
/head
s
/master from
.
commit
|
commitdiff
|
tree
2005-08-30
Jun
i
o
C Hamano
A
c
cumulated documentation updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Hamano
git-repa
c
k
-script:
Add option t
o
repa
c
k all o
b
je
c
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Ju
n
io C Ham
a
no
Updat
e
s:
s
how-branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
J
unio C
Hamano
Merge refs/
h
eads
/
mas
t
er
from
.
commit
|
commitdiff
|
tree
2005-08-29
Junio C Hamano
mailinfo
a
nd
applymbox upd
a
tes
Signed-off-by:
Junio C Hamano
/ 濱野 純 <junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
Junio C Hamano
D
o
cum
e
n
t "gi
t
cherry-pick"
a
nd "git revert"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
Junio C Haman
o
Remove gi
t
-
a
pply-patch-
s
cript
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
J
u
nio C Hamano
Redo "r
e
vert" usi
n
g
three-way me
r
ge m
a
c
h
inery
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
Junio C
Ha
m
ano
Re
v
ert "Replace zero
-
length array decls with []
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
Junio
C Hamano
Merge
r
efs
/
head
s
/master f
r
o
m
.
commit
|
commitdiff
|
tree
2005-08-29
J
u
nio
C
H
a
m
a
no
Me
r
ge
r
efs/heads/portable
f
rom http://www
.
c
s
.
b
e
rkeley
.
.
.
commit
|
commitdiff
|
tree
2005-08-29
Junio C Hamano
Merge refs/heads/master
f
rom
.
commit
|
commitdiff
|
tree
2005-08-29
Junio C Hamano
Update Sub
m
it
t
i
n
g
P
atches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-28
J
u
n
i
o C H
a
m
a
n
o
Teach git-stat
u
s-s
c
ript
about git-
l
s-files
--others
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-28
Junio C Hamano
Sh
o
w the branch name more
p
r
ominently in "git
s
tatus
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-28
Ju
n
io
C Hamano
Barf nice
l
y when "gi
t
push" is
run wi
t
hout parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Junio C Hamano
Update SubmittingPatches to add
M
U
A
specific n
o
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
J
u
n
io C Hamano
Me
r
ge
ma
s
t
er bran
c
h
c
hanges into releas
e
candidate
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Junio C
H
amano
Ac
c
e
pt -m and fri
e
nds
f
or initial commits and merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
J
u
n
io C Hamano
A
dd
how-to
on
u
sing up
d
ate
-
hook
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Junio C Hama
n
o
Fix pull
i
ng into the
same branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Junio C Hamano
Enable git-send-em
a
i
l
-script on Debian
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Junio C Hamano
U
pdat
e
the main
d
ocumentation index
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
J
u
nio
C H
a
mano
Mer
g
e refs
/
head
s
/master from
.
commit
|
commitdiff
|
tree
2005-08-26
Ju
n
io C
H
amano
Add Abst
r
act: support for howto index gene
r
at
o
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next