repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] Don't output 'Automatic merge failed, ...'
2005-09-13
Ju
n
io C Hamano
[PATCH] Define relative
.
g
it/objec
t
s/info/alt
e
rnates
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
unio C H
a
mano
Detect ls-remote failure prope
r
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Ham
a
no
Fix off-by-one error in
g
it-m
e
rge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C Hamano
Propagate er
r
ors f
r
om fetch-pack correctly
t
o git-
f
etch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
Hamano
Fix CDPAT
H
p
roblem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
J
u
nio C Hamano
Document gi
t
-grep and li
n
k
i
t from th
e
main
git(7)
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Junio C
H
amano
[PATCH] M
a
k
e 'git
ch
e
ckout'
a
bit more f
o
rg
i
ving whe
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-13
Jun
i
o C Hamano
[PATCH] Omit pat
c
he
s
tha
t
have al
r
eady b
e
en
m
e
r
ge
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio C Hamano
Allow find
i
n
g t
h
i
n
g
s that begin w
i
th a dash in 'gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-12
Junio
C
Hamano
Use
i
nt i
n
stead of so
c
k
len_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Add a new merge strat
e
g
y
by Fredrik
K
uivinen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C
H
a
m
ano
'git-merge': Document
a
t
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Hamano
Use Daniel's read-tr
e
e
i
n
the
merge
stra
t
egy '
r
esolve'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
unio C Hamano
M
u
lti-backend merge dr
i
ver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
J
u
nio C Hamano
Plug
l
e
ak in Daniel
'
s
r
ead-tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C Ham
a
no
[
PAT
C
H
]
Add
d
ebugging
help for
ca
s
e #16 to read-tree
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio C Haman
o
[PA
T
CH] Disable
d
ebug
g
ing from read-tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-11
Junio
C
H
a
m
ano
F
ix 'g
i
t
-show
-
b
r
anch --list <head>'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Ju
n
io C Hamano
Add 'g
i
t bisect replay/log'
documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio C Ham
a
no
Ke
e
p
bisecti
o
n log so that it can be
r
e
played
l
at
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Juni
o
C
H
a
m
ano
Fi
x
copy marking from di
f
fcore-rename
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-10
Junio
C Hamano
Make sure we
h
ave le
a
di
n
g dir
e
ctorie
s
under refs/{heads
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Juni
o
C
Hamano
s
h
ow-b
r
anch:
--list and -
-
independent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Hamano
Retir
e
support
f
or
o
ld e
n
v
ironment
v
ariables
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Juni
o
C Hamano
Adjust
.
giti
g
nore f
o
r
big r
e
name
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Jun
i
o
C Hamano
Ignore dates
t
a
mp-only changes wh
e
n installi
n
g we
b
doc
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Junio C Ham
a
no
Squel
c
h `removal' mess
a
ge from 'git reset
--hard'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-09
Ju
n
io
C H
a
mano
'bu
i
ld' script
s
before ins
t
all
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio C Hamano
Show all
merge
-
base can
d
ida
t
es from show-branch --merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
J
unio
C
Hamano
Document
a
tion u
p
dates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Ju
n
io C Hamano
git --vers
i
o
n
tells which version of git y
o
u have
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-08
Junio
C Ha
m
ano
Big t
o
ol renam
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
J
u
nio C Hamano
GIT
0
.
99
.
6
commit
|
commitdiff
|
tree
2005-09-07
Junio C Hama
n
o
Doc
u
mentati
o
n up
d
a
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
Juni
o
C Hamano
Documentation updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-07
J
u
nio C Hama
n
o
Flatten too
l
s/ directory to
make
bui
l
d
procedure simpler
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
Junio C
H
amano
m
ailin
f
o: barf and ex
i
s
t
u
p
on nested
m
ultipart
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-06
J
un
i
o
C H
a
m
a
no
Merge bra
n
ch
'm
a
st
e
r' of
.
commit
|
commitdiff
|
tree
2005-09-06
Junio C
H
amano
Format fix for a
s
ciidoc documentati
o
n titles
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Merge branch
'm
a
s
t
e
r
' of
.
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Ret
i
re git-clone-
d
umb-
h
t
tp
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-05
Junio C Hamano
Install
archimport-
s
c
r
ipt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Hamano
Merge
branc
h
'mas
t
er' of
.
commit
|
commitdiff
|
tree
2005-09-04
Junio C Hamano
A
d
d copy/rename check for git-apply
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Junio C Hamano
Add
a link from
u
pd
a
te-server-info documentati
o
n to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-04
Juni
o
C
H
amano
git-applymbo
x
: fi
x
'-c'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-03
Junio C Ham
a
no
D
ocu
m
ent hooks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
J
u
nio
C
Ha
m
a
n
o
M
er
g
e branch 'master'
of
.
commit
|
commitdiff
|
tree
2005-09-02
Junio C
Hamano
Mention post-update
when we first talk abou
t
publishing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C
Hamano
script
s
: equal
i
ty test '==' is not portable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Juni
o
C Hamano
git-checko
u
t-
s
c
rip
t
:
Rem
o
ve unnec
e
s
sary variable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-02
Junio C Hamano
F
ix autome
r
ge mes
s
ag
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Ju
n
i
o C Hamano
Add repository-
l
ayou
t
d
o
cume
n
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Ju
n
i
o C Hamano
Merge refs/heads/
m
aster from
.
commit
|
commitdiff
|
tree
2005-09-01
J
uni
o
C Ham
a
no
Use 'git status' now
it ca
n
handle initial c
o
mmit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Junio C H
a
mano
Fix
git-s
t
atus w
h
en HEA
D
is invalid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-09-01
Juni
o
C
Hamano
F
i
x
git
-
l
o
g-script when H
E
A
D is invalid
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Ju
n
io C Hamano
Add
Pine 4
.
63 h
e
lp from Dani
e
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
Juni
o
C Ha
m
a
n
o
Merge ref
s
/heads/master from
.
commit
|
commitdiff
|
tree
2005-08-31
Juni
o
C Hamano
Upda
t
e tu
t
orial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-31
J
u
n
io C H
a
m
ano
sho
w
-branch: make it work in a subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C
Hamano
M
er
g
e refs/
h
ea
d
s/maste
r
from
.
commit
|
commitdiff
|
tree
2005-08-30
J
u
nio C
H
aman
o
cat-file:
m
ake it work in
a subdi
r
ectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Haman
o
Documen
t
aion upd
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Ju
n
io C Hamano
'git
bisect visualize
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
u
nio C Hamano
Merge refs/heads/ma
s
ter
f
rom
.
commit
|
commitdiff
|
tree
2005-08-30
J
u
nio C Hamano
parse-remote: tr
i
vial f
i
x to
a
ll
o
w refs/{head
s
,tags
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
unio C Hamano
Merge r
e
fs/heads/ma
s
ter from paulus
commit
|
commitdiff
|
tree
2005-08-30
Jun
i
o C Hamano
Make sure h
o
w
to/*
.
html is built
as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Ju
n
io C H
a
m
a
no
M
e
rge
r
e
fs/heads/maste
r
from
.
commit
|
commitdiff
|
tree
2005-08-30
Juni
o
C
Ham
a
n
o
A
l
low asciidoc formatted documentation
i
n howto/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Jun
i
o C Ham
a
no
Merg
e
refs/heads/master f
r
om
.
commit
|
commitdiff
|
tree
2005-08-30
J
unio C Hamano
Add [HOW
T
O]
r
evert/
b
r
anch/rebase
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
J
u
nio C Hamano
g
it commit: Allow edi
t
ing
o
n all occasions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C
Haman
o
D
o not verify reverted/cherry-picked/rebased pa
t
ches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C H
a
mano
F
ix comp
i
lation
wa
r
nings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C
H
amano
M
erge ref
s
/heads/master
f
r
o
m
.
commit
|
commitdiff
|
tree
2005-08-30
Junio C Haman
o
A
ccumulated do
c
umentation updat
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Jun
i
o C
Haman
o
git-repack-
s
cript:
A
dd option to repack all o
b
jects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-30
Junio C Hamano
Updates: show-
b
ranch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
J
u
nio
C
H
aman
o
Merge refs/heads/mas
t
er from
.
commit
|
commitdiff
|
tree
2005-08-29
Junio C Ha
m
an
o
mailinfo and applymbox update
s
Signed-off-by:
Junio C Hamano
/ 濱野 純 <junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
Junio C
H
amano
Document
"g
i
t cherry-pi
c
k" and "g
i
t r
e
ve
r
t"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
Junio
C
H
a
mano
Remo
v
e git-app
l
y
-
patch-script
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
J
unio C Hamano
Redo "r
e
vert" u
s
ing th
r
ee-way
m
erge machine
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
Junio C Hamano
Revert "Replace zero-length
a
rray decls with []
.
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-29
Ju
n
i
o C Hamano
Merge refs/heads/master
fr
o
m
.
commit
|
commitdiff
|
tree
2005-08-29
Junio C Ha
m
a
n
o
Me
r
ge r
e
fs/h
e
ads/porta
b
le from htt
p
://www
.
cs
.
berkel
e
y
.
.
.
commit
|
commitdiff
|
tree
2005-08-29
Junio
C
Hamano
Merge ref
s
/hea
d
s/master from
.
commit
|
commitdiff
|
tree
2005-08-29
J
u
nio C
Hamano
Up
d
ate Su
b
mittin
g
P
a
tches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-28
Junio C Ha
m
ano
Teach git-stat
u
s-sc
r
ipt ab
o
u
t git-ls-files
-
-others
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-28
J
unio C Hamano
Show the branch name more promin
e
ntly in "git stat
u
s"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-28
Junio C Haman
o
Bar
f
nicely w
h
e
n
"git push"
i
s
r
un without param
e
t
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Juni
o
C
H
a
mano
Updat
e
Submi
t
tingPatch
e
s to add M
U
A
s
pecific notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Jun
i
o C Ha
m
ano
Merge master
b
ranch changes
i
n
to releas
e
candidate
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
J
u
nio C Hamano
A
c
cept -
m
and friends
f
or initi
a
l commits and merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Junio
C
Hamano
Add
h
ow-to on using update-
h
ook
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
J
u
nio C Haman
o
Fi
x
pulling into the
s
ame branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Junio C Hamano
Enable git-send-
e
mail-s
c
ript on Debia
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-08-27
Junio C Hamano
Update the main docume
n
tation index
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next