repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/cherry-pick' (early part)
2008-03-11
Junio C H
a
m
ano
M
e
rge branch 'jc/cherry-pick' (early part)
commit
|
commitdiff
|
tree
2008-03-11
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-03-11
Junio
C
Hama
n
o
Merge
branch 'kb/maint-fil
t
er-branch-disappear' into
.
.
.
commit
|
commitdiff
|
tree
2008-03-11
J
u
n
io
C
Hamano
M
erge bra
n
ch 'aw/m
a
int-shor
t
log-bla
n
k-lines' into maint
commit
|
commitdiff
|
tree
2008-03-11
SZEDER Gábor
update
'git rebase' docum
e
n
t
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-10
Junio
C
Hamano
gi
t
-
pull documentation: warn about t
h
e option order
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Jeff King
Add a test f
o
r read-tree -
u
-
-reset
w
it
h
a D/F conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Junio C
Ham
a
no
M
e
rge branch 'ph/parseop
t
'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
M
e
r
ge branch 'dp/clean-fix'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge
branch 'ml/submodule-a
d
d
-existing'
commit
|
commitdiff
|
tree
2008-03-09
Jun
i
o C Hamano
Merge branch 'mr/compat
-
snprintf'
commit
|
commitdiff
|
tree
2008-03-09
J
u
nio C Haman
o
Merg
e
branch 'sp/fetch-opt
i
m'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branch 'jc/d
e
scribe-alw
a
y
s'
commit
|
commitdiff
|
tree
2008-03-09
Junio
C
Hamano
M
erge bra
n
ch '
j
c/am'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Ham
a
no
M
e
rge
branch
'
c
r
/reset-
p
arse
o
pt'
commit
|
commitdiff
|
tree
2008-03-09
Junio C
Ha
m
ano
Merge
b
r
anch 'jn/g
i
tweb-pickaxe'
commit
|
commitdiff
|
tree
2008-03-09
Junio C Hamano
Merge branch 'kb/maint-filter
-
branch-disappear
'
commit
|
commitdiff
|
tree
2008-03-09
J
unio C
H
a
mano
M
e
rge branc
h
'maint'
to sync w
i
th 1
.
5
.
4
.
4
commit
|
commitdiff
|
tree
2008-03-09
Junio C H
a
mano
GIT 1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
Sant
i
Béjar
ident
.
c: reword
e
r
ror message when the
u
s
er name c
a
nnot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-09
J
ohn Goerzen
Fix dcommit, rebase wh
e
n rewriteRoot is in use
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
f
ilter-branc
h
: handle "disappeari
n
g tr
e
e
" case c
o
r
r
ectly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Bailey
m
erge-t
o
ol documentatio
n
: describ
e
cu
s
tom co
m
m
and usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Char
l
es
B
ailey
git-mergeto
o
l d
o
c
u
men
t
ai
t
on: show t
o
olnames in typewriter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Adeodato Si
m
ó
R
e
a
l
ly make the LF
a
fter reset
i
n fast-impo
r
t optional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C
H
amano
Mer
g
e bran
c
h
'aw/maint-short
l
og-blank-lines'
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C Haman
o
Merge branch 'mh/
m
aint-
h
t
t
p-proxy-fix' into maint
commit
|
commitdiff
|
tree
2008-03-08
Jun
i
o
C Hamano
Merge branch
'
js/m
a
int-d
a
e
mon' int
o
mai
n
t
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merg
e
b
r
anch
'js/main
t
-cvsex
p
o
r
t
'
into maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C
H
amano
Merge branch 'j
c
/maint-log-merge-left-right' into maint
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge branch 'ew/ma
i
nt-
s
vn
-
c
e
rt-fileprovider'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2008-03-08
Juni
o
C Haman
o
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-03-08
Junio C
Hamano
send-email: --no
-
s
i
gned-off-cc
s
hould suppres
s
'sob' cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
J
u
n
i
o C Hama
n
o
Merge branch 'js/reflog-d
e
l
ete'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hama
n
o
Merge br
a
nc
h
'dc
/
format-pre
t
ty'
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Ha
m
ano
M
erg
e
branch '
c
b/mergetool'
commit
|
commitdiff
|
tree
2008-03-08
Ju
n
io C
Hamano
git-clean: add t
e
sts for rela
t
ive
p
ath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry
P
otapov
g
it-clean: correct prin
t
ing r
e
l
at
i
ve path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Dmitry Potapov
Make private qu
o
te_path()
i
n w
t
-status
.
c availab
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Pier
r
e Ha
b
ouzit
unquote_c_style: fix of
f
-by-
o
ne
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C
Hamano
test-lib: fix TE
R
M to dumb fo
r
test repeatability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
U
w
e Kleine-König
config
.
t
xt: refe
r
to -
-
upload-pack a
n
d
--
r
eceive-pack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Jun
i
o C H
a
mano
M
e
rge
b
ra
n
ch
'
ar/sgid-bsd'
commit
|
commitdiff
|
tree
2008-03-07
J
u
nio C
H
amano
Merge branch 'cc/run-command'
commit
|
commitdiff
|
tree
2008-03-07
J
unio C Ha
m
ano
Re
v
er
t
part of d
0
89eba (set
u
p
: saniti
z
e abso
l
ute and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ha
m
ano
Revert part o
f
1abf095 (g
i
t-add: a
d
j
ust to
t
h
e get_paths
p
ec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C
H
amano
Rev
e
rt part of 744dacd (b
u
iltin-mv: minimum f
i
x to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
J
u
nio
C
Haman
o
get_pathspec(): die when an
o
ut-of-tr
e
e pa
t
h is given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-06
J
uni
o
C Hamano
Merge branch
'm
a
int'
of
gi
t
://repo
.
or
.
cz/git-gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
Ja
k
ub
Narebs
k
i
git
w
eb: F
i
x
and sim
p
lify pi
c
kax
e
search
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Mark Levedahl
git-submodule - Allow ad
d
i
n
g a
s
u
b
module in
-
p
l
ace
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
An
d
y Whitcroft
shortlog: take
t
he first populated
line of the descri
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
M
i
cha
l
Roko
s
Add compat
/
snprintf
.
c
for systems that r
e
turn bogus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Alex
Ri
e
sen
Do not use GUID on dir i
n
git init --shared=all on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Christian
C
o
u
der
run-command: Redir
e
ct s
t
derr t
o
a pi
p
e
bef
o
r
e redirec
t
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
arlos Rica
Make builti
n
-reset
.
c us
e
parse_op
t
i
ons
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER Gá
b
o
r
bash: git-branch -d and -m lists only local branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZ
E
DER Gábor
bash: ad
d
git-bra
n
ch opti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bail
e
y
Add a
very basic
t
est script
for git mergetool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach git m
e
rgetool t
o
use custom com
m
ands
de
f
ined
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed
an internal v
a
riable of
me
r
get
o
ol to support
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bai
l
e
y
Tidy up git me
r
getool's ba
c
kup file be
h
aviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis Cheng
log/show
/
whatchanged: introduce format
.
pretty configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Den
i
s Cheng
speci
f
y
e
xplicit "--pretty=medium" wi
t
h `git
l
og/show
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
D
enis Chen
g
whatchanged
d
o
c
umentation: share description of --pret
t
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Juni
o
C Hamano
am: --rebasing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Ju
n
io C Hamano
am: remove suppo
r
t
for -d
.
dotest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Ju
n
io C Hamano
am: rea
d
from the right mai
l
box w
h
e
n
start
e
d fr
o
m a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
J
u
n
io C Hamano
fsck
.
c: fix bogus "empty tree" check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shaw
n
O
.
Pearce
T
e
ach git-fetch to expl
o
i
t
s
e
rver s
i
de auto
m
at
i
c tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Shawn
O
.
Pearce
Teach fetch-pack/upload-pack about
--i
n
clude-tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Sha
w
n O
.
Pearce
git
-
pack-objects: Automatically pa
c
k annotated ta
g
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Ju
n
io C Hamano
R
e
vert "
u
npack-objects: prevent writin
g
o
f
inconsist
e
nt
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio
C
Hamano
Rev
e
r
t
"rece
i
ve-p
a
ck: u
s
e strict mode for unpacking
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio
C
H
amano
Me
r
ge branch
'main
t
'
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pear
c
e
Fix 'git remote sh
o
w' regress
i
on on empty repository
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
M
ike Hommey
t3407-reb
a
se-abort
.
sh: Enhance existi
n
g
tests, and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Si
m
on Hausma
n
n
git-p4: Fix
i
mport of changesets with fil
e
de
l
etions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Alex Ri
e
sen
F
i
x
t
es
t
for
c
lean
u
p failu
r
e in t73
0
0 on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio C Ha
m
ano
t6
1
20 (describe): chec
k
--
l
o
n
g
properly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Sha
w
n
O
.
Pe
a
rce
A
dd git-describe test for "ve
r
i
fy annotated tag names
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearc
e
Tes
t
f
or
p
acked tags in git-des
c
ribe
output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Don't a
l
low
g
i
t-descri
b
e
failures to go unnoti
c
ed in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Jun
i
o C Ham
a
no
describ
e
: re-fix
displ
a
y
_
name()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Matthieu
M
oy
Fix incorrect wording in
git-mer
g
e
.
txt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Gerrit Pape
g
i
t-merge
.
sh: be
t
ter handling of c
o
mbined --
s
q
ua
s
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Mike Hommey
Fix random c
r
ashes in http_c
l
eanup()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
describe: fix
--lo
n
g
outpu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Juni
o
C Hamano
git-describe: use tags found in
pa
c
ked-refs correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Brandon
C
a
sey
t39
0
3-stas
h
.
sh: Add
tests for n
e
w sta
s
h comman
d
s dro
p
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
B
randon C
a
se
y
gi
t
-reflog
.
txt: Document new
c
ommands --upd
a
teref
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
B
r
a
ndon Casey
t
3
903-stash
.
sh: Add mi
s
si
n
g '
&
&' to body of testcase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C
H
a
m
a
n
o
Merg
e
commit
'743598
2
1' into js/reflog-delete
commit
|
commitdiff
|
tree
2008-03-03
Ma
r
tin Koegler
fetch-
p
a
c
k
:
check pars
e
_commit/obje
c
t res
u
lt
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
descr
i
be --alwa
y
s:
f
al
l
back to show
i
ng an abbreviated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Shawn O
.
Pearce
Teach git-fetch to grab a
t
ag at th
e
same time as a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
S
h
awn O
.
Pe
a
rce
Make
git
-
fe
t
ch follow tags we already hav
e
obje
c
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Shawn O
.
Pearc
e
Teach up
l
oad-pack
to
log the received need line
s
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Sha
w
n
O
.
Pearce
Free th
e
p
ath_lists used to f
i
nd non
-
local tags in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
S
hawn O
.
Pear
c
e
Allow builtin-fetch'
s
find_non_local_tags
to ap
p
end
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next