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
Documentation: talk about guts of merge in tutorial.
2005-11-07
J
unio C Hamano
Doc
u
m
entation: tal
k
a
b
out guts of m
e
r
g
e
i
n t
u
torial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Jon Lo
e
liger
Refactored merge
o
ptions into separ
a
te
merg
e
-option
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Johannes Schindelin
htt
p
-
f
etch:
d
o not use curl_message
a
fter releasi
n
g
i
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
ohannes Schindelin
Allow
GIT_DIR to be an
a
b
solute path
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Pa
u
l
C
o
l
lins
http-push
.
c: include with angle bracket, not dq
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Junio C Hamano
Set up remot
e
s
/origin to tra
c
k all r
e
mote branches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
J
u
nio C Hamano
git-stat
u
s: do no
t
m
a
rk unmerged
p
aths as co
m
mittable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-07
Jun
i
o C Hamano
ls-files: -
-
others sh
o
u
l
d not say u
n
m
erged pa
t
hs are
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Randal L
.
Schwartz
Use fink/darwinport pat
h
s for OSX
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
o
n Loelig
e
r
Refactor merge stra
t
eg
i
es into separate inclu
d
able
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Docu
m
ent
expat dependency when using http-push
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
n
i
o
C Hama
n
o
M
erge
in http-
p
ush firs
t
s
t
ag
e
.
commit
|
commitdiff
|
tree
2005-11-06
N
i
ck Hen
g
eveld
Refresh the remote lock if it
is a
b
out
to expire
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Nic
k
Heng
e
veld
Improve lock
h
a
n
dl
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ni
c
k Hengeveld
Suppor
t
r
emote references wit
h
slashes in the
i
r
n
a
mes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Ni
c
k Hengevel
d
Verify remote packs, speed up pe
n
di
n
g
r
eques
t
queue
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Nick Hengeveld
A
dd support for pushing to a
r
emote
reposit
o
ry using
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
unio C H
a
mano
Debian: test
b
uild
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Haman
o
Further Debian split
fixes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Jun
i
o C H
a
mano
Insta
l
l
asciidoc sources as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hama
n
o
Package s
p
lit
:
Deb
i
an
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio
C Hamano
S
im
p
lify
C
FLA
G
S/DEFINES in M
a
kef
i
le
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
J
u
nio
C H
a
mano
git-fetch
:
fail if
s
pecified refspec
does not ma
t
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
Documenta
t
i
on: pull
/
clone
ref
m
apping clarif
i
cati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-06
Junio C Hamano
git-format-p
a
t
c
h: silly typo fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
ama
n
o
test: t410
2
-app
l
y-rename fai
l
s wit
h
strict umask
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Hamano
git-clo
n
e: fix local
c
lone
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
a
mano
in
i
t-db::copy_file
(
)
-
use c
o
py_f
d
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
unio
C H
a
mano
copy
.
c::co
p
y_fd() - do
not leak f
i
le descriptor on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
J
unio C Hamano
Do
c
umentation: forma
t
-
patch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C Haman
o
format-p
a
tch: "rev1
.
.
" should mean "rev
1
.
.
HEAD"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
Hamano
D
o
cument
a
tion:
git-fetch/pull update
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Jon Loel
i
g
e
r
A
dded a few
e
xamples to git-pull ma
n
p
age
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-05
Junio C
H
aman
o
Docu
m
ent the --
n
o-
c
ommit fl
a
g bet
t
e
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Junio C
H
a
mano
D
o
cumen
t
ation: -mer
g
e and -pull:
describe merge strategie
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Ju
n
io C Ham
a
no
Doc
u
mentation: git-add --
do not say "
c
a
che", add ex
a
mples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
J
unio
C Ham
a
no
gi
t
-tag: Do n
o
t assume
the working tree
r
oot is writable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-04
Ni
c
k
He
n
geveld
Remo
v
e t
h
e tem
p
file
if i
t
is empty after the requ
e
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Hamano
Illustrati
o
n:
"
C
o
mmit
D
AG Re
v
ision Naming"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Ju
n
io C Hamano
I
l
lustrat
i
on: "G
i
t
D
iff Types"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C
H
a
m
a
no
Illust
r
ation: "Fundamenta
l
Git Index Ope
r
at
i
ons"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
Hamano
g
it-merge-
o
urs: make
sure
our
i
ndex matches HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C
H
amano
Add 'ours' me
r
ge strat
e
g
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
unio C
H
amano
A
d
d --no-commit to gi
t
-merge/g
i
t-pu
l
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
n
io C Hamano
D
o
c
ument --since and
--until options to
r
ev-parse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio
C Hamano
Be careful when dereferencing tags
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Peter E
r
iksen
[PATCH] Clean up the SunOS Makefile rule
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Junio C Ha
m
ano
Igno
r
e
'
\r'
at the end o
f
line
i
n
$
GIT_DIR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Alex Ri
e
sen
remove CR/LF from
.
g
i
tignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
Juni
o
C Ha
m
ano
Do not fail o
n
h
i
erarchical b
r
anch n
a
mes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-03
J
u
nio C Hama
n
o
M
ake
t
e
s
t-date buildable a
g
ain
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
git-clone: do not forget to c
r
eate ori
g
in branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
J
unio C Hama
n
o
Do not put a
u
tomatic merge message after signed-off
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Jun
i
o C
H
amano
Add
-
P
t
o
the docume
n
tat
i
on head
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Martin
L
anghoff
cvsimpo
r
t: c
v
sps should b
e
quiet too
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
M
artin Langhoff
c
vsimport
:
intr
o
duce -P
<cv
s
ps-output-file> o
p
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Mar
t
in Langhoff
cv
s
i
m
port: ca
t
ch err
o
r cond
i
tion
where cv
s
h
ost di
s
appea
r
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-02
Junio C Hamano
Do not in
s
tall bac
k
w
ard c
o
mpatibil
i
ty l
i
nks
a
nymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
J
o
se
f
Wei
d
e
n
d
orfer
Strip any tr
a
iling
s
lash on destination argum
e
nt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Petr Ba
u
d
i
s
gi
t
-a
m
.
txt is
n
o stub anymore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Pet
r
Ba
u
dis
Documentation fo
r
git
-
f
m
t
-mer
g
e-msg
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Pet
r
B
audi
s
Re
m
ove gi
t
-find
t
ags
.
per
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Jon
L
oe
l
iger
Remove
'
Pre
v
iously this command wa
s
k
no
w
n as
.
.
.
'
messages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
Jun
i
o C Hama
n
o
Fix
c
o
nstness of
i
nput
in
mozill
a
-
sha
1
/sha1
.
c
::SHA1_Upda
t
e()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-11-01
J
u
nio C Hamano
Document t
h
e use of "current directory" as pu
l
l
sour
c
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Lin
u
s Torvalds
Add examp
l
es for git-log documentation and othe
r
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
W
o
r
k
aro
u
nd
an RPM build problem
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Ju
n
i
o
C
H
a
mano
Fix rev-
l
ist documentati
o
n
again (
-
-
s
p
a
rse and pat
h
spec)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Ju
n
i
o C
H
aman
o
Update git-pack-objects documen
t
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hama
n
o
Update git-rev-list options lis
t
in
rev-p
a
rse
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Junio C Hamano
Updat
e
usa
g
e string and do
c
ument
a
tion for git-r
e
v-list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Chris
S
hoem
a
ker
Add
to usage
a
n
d
d
ocs
f
or
g
it-add
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Chris Shoemaker
A
d
d to
d
ocume
n
tation o
f
g
i
t-upd
a
te-index argu
m
ents
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
Chris Shoemake
r
Add usage statem
e
n
t
t
o
gi
t
-ch
e
ckout
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-31
J
u
nio C Hamano
GIT 0
.
99
.
9 ma
s
t
e
r
b
r
anch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hama
n
o
GIT 0
.
99
.
9
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
Documenta
t
ion u
p
dat
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Juni
o
C Hamano
Do not mmap-co
p
y
t
he whole thing
;
just use
c
o
p
y
_
f
d(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
T
e
a
ch loc
a
l-fetch
a
bout lazy ob
j
ect directori
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio C Hamano
Fix recent documenta
t
i
o
n
f
orma
t
bre
a
ka
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schin
d
elin
m
ake
t5501 less a
n
noyin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johannes S
c
h
i
n
de
l
in
fix
m
ulti_a
c
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schindeli
n
git-fetch-pack: Sup
p
ort multi_ack extension
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johann
e
s Sc
h
in
d
elin
g
it-upload-pa
c
k: Support t
h
e mu
l
ti_ack
p
r
otoc
o
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schindelin
Suppor
t
receiving server cap
a
bilities
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johan
n
es
Sc
h
i
nde
l
in
git-uploa
d
-pac
k
: More
efficient usa
g
e of
t
he ha
s
_
sh
a
1
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johanne
s
S
ch
i
ndelin
Impleme
n
t an interoperabi
l
ity test for f
e
tch-pack/upload
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schindelin
Impleme
n
t a test
f
or git-fetch-
p
ack/git-uploa
d
-pack
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Johannes Schindelin
Make ma
x
imal
u
se of the
remote refs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
J
o
h
annes Sch
i
ndelin
Su
b
ject: [PATC
H
] git-fetch-pack: Do
not use
g
it-rev
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
Junio
C Ham
a
n
o
git
-
apply --numstat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
s
h
o
e
m
a
ker@cox
.
net
Add
usage help t
o
git-
p
ush
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
sho
e
m
aker@cox
.
net
Add us
a
ge help for git-reset
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoemaker@c
o
x
.
net
Minor
c
l
arifications in diffcore documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoemaker@cox
.
net
Remove -r fr
o
m common diff option
s
d
ocum
e
nta
t
i
o
n
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
shoemaker@cox
.
net
upd
a
te usage string
f
or git-commit
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-29
c
.
sh
o
ema
k
e
r
@cox
.
net
git
-
pus
h
.
sh
:
R
etain
c
uten
e
s
s, add hel
p
fulness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
L
i
n
u
s
T
o
r
valds
Be more car
e
ful
a
bout r
e
ference parsing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Linus Torvalds
Be marginally
more ca
r
eful about removing obj
e
cts
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2005-10-28
Chris Shoem
a
ker
D
ocumentation chang
e
s to
r
ec
u
rsi
v
e option
f
or gi
t
-
d
iff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next