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: document pitfalls with 3-way merge
2013-12-09
b
rian m
.
carlson
Documenta
t
ion
:
documen
t
pitf
a
l
ls with
3-way
m
erge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-02
Junio C Hamano
Gi
t
1
.
8
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-12-02
Junio C H
a
mano
submodule: do
n
o
t c
o
py unknown update mode from
.
gitmodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-11-27
Ric
h
ard Hansen
remote-hg: don't decode UTF-8
paths into U
n
icode objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-11-20
J
unio C Hamano
Git
1
.
8
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-11-18
Junio C
H
a
mano
Reve
r
t "up
l
oad-pack:
s
e
nd non-
H
EAD symbolic refs"
commit
|
commitdiff
|
tree
2013-11-08
J
unio
C Hamano
Git 1
.
8
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-11-08
Junio C Hamano
M
e
r
g
e branch 'jn
/
t
e
st-pr
e
req-perl-
d
oc' into
m
aint
commit
|
commitdiff
|
tree
2013-11-08
Junio C Ha
m
ano
Merge branch 'ap/remote-hg-unqu
o
t
e
-cqu
o
te' into maint
commit
|
commitdiff
|
tree
2013-11-08
Junio C Hamano
Me
r
ge branc
h
'jc/up
l
oad-pack-send-symre
f
'
into maint
commit
|
commitdiff
|
tree
2013-11-08
J
u
nio
C
Hamano
Merge bran
c
h 'jk/htt
p
-auth-redirects' into
m
aint
commit
|
commitdiff
|
tree
2013-11-07
J
u
nio C H
a
mano
Start preparing f
o
r 1
.
8
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-11-07
Ju
n
i
o
C Ha
m
ano
Merge branch
'sc/doc-h
o
wto-dumb-http'
i
nto
maint
commit
|
commitdiff
|
tree
2013-11-07
Ju
n
io
C
H
a
mano
Merge bra
n
ch 'vd/doc-unpack-
o
b
j
ects' into
m
ain
t
commit
|
commitdiff
|
tree
2013-11-07
Junio
C
Hamano
M
e
rge branch
'jk/subtree-
i
nstall-fix' into maint
commit
|
commitdiff
|
tree
2013-11-07
Juni
o
C
Hamano
Merge branch 'hn/log-gr
a
ph-color-octopus' into maint
commit
|
commitdiff
|
tree
2013-11-07
Jun
i
o C Haman
o
Merge
b
r
a
nc
h
'mm/checkout-auto-track-fix' into maint
commit
|
commitdiff
|
tree
2013-11-07
J
u
n
io C
Ha
m
ano
Mer
g
e branch 'sg
/
prompt-s
v
n-remote
-
fix' into maint
commit
|
commitdiff
|
tree
2013-11-07
Junio C Hamano
Me
r
ge branch 'jk/split-b
r
o
ken
-
ident
'
into
m
aint
commit
|
commitdiff
|
tree
2013-11-07
Junio C Hamano
Me
r
ge bra
n
ch 'jc/revis
i
on-
r
ange-unpeel'
into maint
commit
|
commitdiff
|
tree
2013-11-07
Karsten Blees
gitig
n
o
re
.
txt: fix documentati
o
n of "**" patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-11-01
V
i
vien Didelot
D
ocumentati
o
n: "pack-file
"
is n
o
t literal in unpack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-31
V
ivien Didelot
Do
c
u
mentation: restore a
spa
c
e in
unpack-obje
c
ts usa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-30
Jeff King
subtree:
a
dd makefi
l
e tar
g
e
t
for
html doc
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-30
Brian Gern
h
a
r
dt
t5570: Update for clone-p
r
ogress-to-stde
r
r b
r
an
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-28
Si
t
aram Chamarty
d
oc/howto: w
a
r
n
ab
o
ut (
d
umb)http
server document being
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-28
Jonathan Nie
d
er
t/REA
D
ME: tests ca
n
use perl even
wi
t
h NO_
P
E
RL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-28
Junio C
Hamano
Git 1
.
8
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-28
Junio C
H
amano
Merge branc
h
'jk/clone-progress-
t
o-stderr' into maint
commit
|
commitdiff
|
tree
2013-10-28
J
unio C H
a
m
a
n
o
Merge branc
h
'jk/format-
p
a
t
ch-from'
i
nto main
t
commit
|
commitdiff
|
tree
2013-10-28
Junio C Haman
o
Merge branch 'jk/shortlog-tolerate-broken-com
m
i
t
' into
.
.
.
commit
|
commitdiff
|
tree
2013-10-28
Junio C Hamano
Merge
branch 'jk/
d
iff-algo' i
n
to
maint
commit
|
commitdiff
|
tree
2013-10-28
Torstei
n
Hegge
tes
t
-
l
ib: fix typo in
comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-28
Christian
C
ouder
s
ha1_fil
e
: mov
e
comment about return v
a
lue where
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-24
Ramsay Jo
n
es
ht
t
p
.
c
:
S
p
ell the null pointer as NULL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-23
Junio C Hamano
A
l
most 1
.
8
.
4
.
2 ;-)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-23
J
u
nio C Hamano
Merge branch 'jc/ls-files
-
k
i
l
l
ed-optim' into maint
commit
|
commitdiff
|
tree
2013-10-23
Jun
i
o C Hamano
Merg
e
bran
c
h 'jh/chec
k
o
u
t-au
t
o-tracking' into maint
commit
|
commitdiff
|
tree
2013-10-23
Junio
C
H
a
m
ano
Mer
g
e branch 'nd/fe
t
ch-into-shal
l
ow' i
n
t
o maint
commit
|
commitdiff
|
tree
2013-10-23
Antoi
n
e
P
e
lisse
remote-h
g
:
unquote
C
-style
p
aths whe
n
exportin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-22
B
r
ian
G
ernhar
d
t
t5570
:
Update for clone
-
pro
g
ress-to-stderr branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-22
Juni
o
C Hamano
Merge br
a
nch 'jk/clon
e
-
p
rogre
s
s-to-st
d
err' into jc
.
.
.
commit
|
commitdiff
|
tree
2013-10-22
Brian Gernhardt
t5
5
7
0
: Update for
s
ymref
c
apabi
l
i
t
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-18
Mat
t
hieu M
o
y
c
h
e
ckout
:
proper error message o
n
'gi
t
checkout
f
oo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-18
Matthie
u
Moy
checkout
:
a
l
low dwim for b
r
anch creation fo
r
"git checkout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-18
Hemmo Ni
e
minen
graph: fix co
l
or
i
n
g
aroun
d
octopus merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-18
N
i
cola
s
Vigier
git-me
r
ge: d
o
cumen
t
the
-S option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-17
Junio C Hamano
Start
pre
p
ar
i
ng
fo
r
1
.
8
.
4
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-17
Juni
o
C
Hamano
M
erge branch 'jk/uploa
d
-pack-kee
p
alive
'
into
maint
commit
|
commitdiff
|
tree
2013-10-17
Jun
i
o C Hama
n
o
Merge branch 'bc/http-backend-allow-405
'
int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2013-10-17
Junio C
Hamano
M
e
rge branc
h
'jc/cvsserver-perm-bit-fi
x
'
i
nto main
t
commit
|
commitdiff
|
tree
2013-10-17
Ju
n
i
o
C
Hamano
Merge b
r
a
n
ch 'js
/
ad
d
-
i
-mingw' into mai
n
t
commit
|
commitdiff
|
tree
2013-10-17
Juni
o
C Hama
n
o
Mer
g
e
b
ranch 'nd
/
git-dir-pointing-
a
t-g
i
t
f
i
l
e' into
.
.
.
commit
|
commitdiff
|
tree
2013-10-17
J
u
nio C Ha
m
an
o
Merge br
a
nch
'
jk/has-sha1-
f
ile-retry-pac
k
ed
'
into m
a
int
commit
|
commitdiff
|
tree
2013-10-17
Junio
C
Hamano
Merge br
a
nch 'ap/commi
t
-author
-
mai
l
map' into maint
commit
|
commitdiff
|
tree
2013-10-17
Junio C H
a
mano
M
e
rge branch 'es/rebas
e
-i-no-abbrev' into maint
commit
|
commitdiff
|
tree
2013-10-17
Junio C Ham
a
no
Merge b
r
an
c
h 'rt/re
b
ase-p-no-merge-
s
u
m
mar
y
'
into maint
commit
|
commitdiff
|
tree
2013-10-17
Juni
o
C Ham
a
no
Merge b
r
anch
'
es/r
e
base-i-
r
espect-core-c
o
mmentc
h
ar
.
.
.
commit
|
commitdiff
|
tree
2013-10-17
S
ZEDER Gábor
t4254: moder
n
i
z
e tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-15
Jun
i
o C H
a
m
ano
revision: do n
o
t peel tags u
s
e
d
in range notation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-15
Ste
f
fen Prohask
a
gi
t
-prune
-
packed
.
txt
:
fi
x
r
e
ference to GIT_OBJECT_DIRECTORY
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-15
SZEDER Gá
b
or
ba
s
h pr
o
mpt: don't
use '+=
'
operator in show upst
r
eam
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-10-15
Je
f
f
K
ing
split_ident:
parse t
i
mesta
m
p
fro
m
en
d
of line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-20
J
e
ff K
i
ng
forma
t
-patch: print i
n
-body "From" on
l
y when needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Jeff King
shortlog: ignore
commits with
missing authors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Jeff King
clone:
a
l
w
ays set trans
p
ort optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Jeff Ki
n
g
c
l
one:
treat "checking conn
e
ctivity" like o
t
her progress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Jeff King
c
lone: send
d
i
a
g
nostic
m
es
s
ages
to std
e
r
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Junio C Ha
m
ano
St
a
rt preparing
for 1
.
8
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Junio C Hamano
Me
r
ge b
r
anch '
b
c/co
m
p
l
etion-for-bash-3
.
0' into maint
commit
|
commitdiff
|
tree
2013-09-18
Junio C Hamano
Merge
b
ran
c
h 'mm/no-shell
-
escape-in-die-message'
into
.
.
.
commit
|
commitdiff
|
tree
2013-09-18
Junio C Hamano
Me
r
ge branch
'
j
l
/some-submodule-config-are-n
o
t-boolean
.
.
.
commit
|
commitdiff
|
tree
2013-09-18
Juni
o
C
Hamano
Merge branch 'tr/log-full-
d
iff-keep-
t
rue-parents' into
.
.
.
commit
|
commitdiff
|
tree
2013-09-18
Jun
i
o
C
Hamano
Merge branch 'j
c
/
t
ransport-
d
o-not-use-conne
c
t-twice
.
.
.
commit
|
commitdiff
|
tree
2013-09-18
Juni
o
C Hamano
Me
r
ge bran
c
h 'sp/clip-read-write
-
to-8mb' in
t
o maint
commit
|
commitdiff
|
tree
2013-09-18
Juni
o
C Hamano
Merge bran
c
h 'jk/mailmap-i
n
complete-line'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2013-09-18
Juni
o
C Hamano
clone:
t
est
the n
e
w HEA
D
d
etecti
o
n lo
g
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Ju
n
io C Hamano
c
onnect:
annotate refs with their sy
m
ref i
n
fo
r
m
ation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Junio C Ha
m
ano
c
o
nne
c
t
.
c:
m
ake parse_featur
e
_
value()
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Junio C Hamano
upload-pac
k
: send non
-
H
E
AD symbo
l
ic refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Junio C Haman
o
upload-pa
c
k:
s
end
symb
o
lic ref information
a
s capa
b
ility
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
Junio C Hamano
uploa
d
-pack
.
c: do not pas
s
conf
u
sing c
b
_data to mark_our
_
ref()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-18
J
unio C Hama
n
o
t5505
:
fix "set-head --auto with ambiguous
HEAD" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-17
Eric Sunshine
t3
2
00: fix
fai
l
ure on case-ins
e
n
sit
i
ve filesyst
e
m
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-17
T
a
y Ray Chuan
t7406-
s
ubmodule-up
d
ate: add missing
&&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-12
Bria
n
M
.
Ca
r
l
s
on
http-ba
c
ke
n
d: pr
o
v
ide Al
l
ow head
e
r for 405
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-12
Junio C Hamano
Merge branch 'maint
'
of git://g
i
t
h
u
b
.
com/
g
it-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2013-09-11
J
u
n
i
o C
H
a
mano
cvsserver
:
pick up th
e
right mode bi
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-10
Brian
M
.
Carlso
n
sen
d
-
e
m
a
il
:
don't call methods
o
n undefine
d
values
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
Jeff King
upload-pack: bump keep
a
live
d
efaul
t
to 5 secon
d
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
Jeff King
upload-pack: send keepalive packets during pack computation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
Pe
r
C
e
d
er
q
vist
branc
h
.
c
: Relax u
n
n
e
cessary requir
e
m
e
n
t on upstre
a
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
J
ohan Herland
t3200: Add te
s
t
d
emonstrating minor regressio
n
in 4
1
c2
1
f2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
nd
Refe
r
to branch
.
<na
m
e>
.
r
e
m
ote/merg
e
when documenti
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han Herlan
d
t
3
200: Minor
f
ix wh
e
n preparing
for tracking failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
land
t
2
0
2
4: Fi
x
&&-c
h
a
i
ning and a coupl
e
of typ
o
s
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-09
Mat
t
h
i
eu Moy
rebas
e
: f
i
x run
_
specific_
r
ebase's
use of
"
r
e
turn" on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-09-05
Junio C H
a
mano
Merge branch 'n
d
/fetch-
p
ack-shallow-fix' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2013-09-05
Junio C Hamano
Merge br
a
nch 'hv/config-fr
o
m-blob' into
ma
i
nt
commit
|
commitdiff
|
tree
2013-09-05
Junio
C
Hama
n
o
M
er
g
e
b
r
a
n
c
h 'maint-1
.
8
.
3' into maint
commit
|
commitdiff
|
tree
next