repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-tool documentation: describe custom command usage
2008-03-08
Char
l
e
s
Bailey
m
erge-t
o
ol documentation
:
de
s
cribe custom command usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
rles
Bailey
git-mergetool docum
e
nt
a
iton: sh
o
w toolnames in ty
p
ewriter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
J
unio C Hamano
Merge branch 'a
w
/
m
a
i
n
t-shortlo
g
-
blank-li
n
es'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Hamano
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2008-03-08
Junio C Ham
a
no
send-email: --no-
s
igned-
o
ff-cc s
h
ould
s
uppress 'sob' cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-08
J
u
ni
o
C Hamano
Merge
b
ranch 'js/reflog-delete'
commit
|
commitdiff
|
tree
2008-03-08
J
u
nio C Hamano
Merge b
r
anch '
d
c
/form
a
t-pretty'
commit
|
commitdiff
|
tree
2008-03-08
Junio C H
a
mano
Merge
b
ranch 'cb/mergetool'
commit
|
commitdiff
|
tree
2008-03-07
Pi
e
r
re Habouzi
t
u
n
quote_c_style: f
i
x off-by-o
n
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio C Ham
a
no
test-
l
ib: fix TER
M
t
o
dum
b
for test
repeatabil
i
ty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Uwe Kleine-König
config
.
txt: refer to
--upload-pack and
-
-receiv
e
-p
a
ck
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-07
Junio
C
Ham
a
no
Merge
bran
c
h
'
a
r
/
sgid-bsd'
commit
|
commitdiff
|
tree
2008-03-07
Ju
n
io C Hama
n
o
Merge
bra
n
ch 'cc/run-command'
commit
|
commitdiff
|
tree
2008-03-06
Junio C H
a
mano
Merge
b
ranch 'm
a
int' of
g
it://repo
.
or
.
cz
/
git-gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2008-03-05
An
d
y Whitc
r
of
t
sho
r
tlog: take the first populated
line of the descrip
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
A
le
x
Ries
e
n
Do not use GUID
on dir in git init --sh
a
red=al
l
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Christian Couder
run
-
command:
R
edire
c
t stderr to a p
i
pe
before redirecting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
SZEDER Gábor
bash: git-branch
-d and -m
lists only loca
l
bran
c
hes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
S
Z
E
DER Gábor
bash:
add
git-br
a
nch op
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
a
i
ley
Add a very
b
asic
test script for
git
m
ergetool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Te
a
ch
g
it merg
e
tool
to u
s
e cus
t
om commands defined
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Char
l
e
s
Bailey
Chan
g
ed an internal variable
of me
r
geto
o
l t
o
su
p
port
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Cha
r
les Ba
i
l
e
y
Tidy up git mergetool's
b
a
cku
p
file behaviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Deni
s
Cheng
log/show/w
h
atchanged: introd
u
ce fo
r
mat
.
pre
t
ty configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis
Chen
g
specify
explicit "--pretty=med
i
um" with `git l
o
g
/s
h
ow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Denis
C
heng
w
h
a
tc
h
anged documentation: share descript
i
o
n
of -
-
pretty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Ju
n
io C
H
amano
f
s
ck
.
c: fix bogus "e
m
pty
t
ree" check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Ju
n
io C Hamano
R
ev
e
rt
"
unpack-objects: p
r
event writing o
f
inco
n
sistent
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C H
a
mano
Revert "receive-
p
ack: use stri
c
t m
o
de f
o
r unpacking
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C
Hamano
M
erge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-03-04
S
h
awn O
.
Pearce
Fix
'
git rem
o
te show'
r
egression on empty reposito
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Mike
H
o
mmey
t3407-rebase-abort
.
s
h: En
h
anc
e
existing tests, and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Simon
H
aus
m
ann
g
it-p4: F
i
x import of chang
e
set
s
with
f
ile
d
eletio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Alex
R
iesen
Fix
test fo
r
clea
n
up
fa
i
lure in
t7300 on Wi
n
dows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio C Hamano
t6120 (descr
i
b
e
): che
c
k --
l
o
ng p
r
operly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Sh
a
wn O
.
Pear
c
e
Add git-descr
i
b
e test for "ver
i
fy annotated tag names
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pe
a
rce
Tes
t
fo
r
packed
t
ags in git-des
c
ribe ou
t
put
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Sha
w
n O
.
Pea
r
ce
Don
'
t allow gi
t
-des
c
r
i
b
e failure
s
t
o go un
n
oticed i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
J
u
nio C H
a
mano
describe: re-fix di
s
play_name()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Matthieu Moy
F
i
x incorrect wordin
g
in git
-
m
e
rge
.
t
x
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Gerri
t
Pape
git-merg
e
.
sh: bett
e
r
h
andling
o
f combined --squ
a
sh
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Mike Hommey
Fix
r
a
n
dom crashes
i
n http_cleanup()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio
C
Ha
m
an
o
describe: fix --long
o
utpu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
git-d
e
scribe: use tag
s
f
o
und
i
n pac
k
ed-r
e
fs correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Bran
d
on Casey
t3903-stas
h
.
sh: Add
t
e
sts
for new stash
c
o
mman
d
s d
r
op
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Bran
d
on Cas
e
y
g
i
t
-reflog
.
t
x
t: Do
c
ume
n
t new comman
d
s
--update
r
e
f
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Bran
d
on Casey
t
3
903-sta
s
h
.
sh: Add missin
g
'&
&
' to body of te
s
t
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
J
u
nio C Hamano
Merge
commit
'74359821' into js
/
reflog-delete
commit
|
commitdiff
|
tree
2008-03-03
M
a
r
tin Koegler
fetch
-
p
a
c
k
:
che
c
k parse_commi
t
/object
results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
J
u
nio C Hama
n
o
Upd
a
te draft release no
t
e
s for 1
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Ham
a
no
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
Update draft
r
e
lease notes for 1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
J
e
f
f
King
revert:
a
c
tually check fo
r
a dirty i
n
dex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
tes
t
s: intr
o
duce test
_
m
u
s
t_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Ping Y
i
n
git
-
sub
m
odule: Fix typ
o
'url' which should be
'
$url'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Björ
n
Steinbr
i
nk
re
c
eive-pac
k
: Initialize PATH
to in
c
l
u
de ex
e
c-dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
R
alf Wildenhues
F
i
x doc typos
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Jean-Luc
H
erren
fast-
i
mport: exit w
i
th pro
p
er message if
n
ot a git d
i
r
commit
|
commitdiff
|
tree
2008-03-03
J
u
nio C Hamano
Merge branc
h
'np/ve
r
ify-pac
k
'
commit
|
commitdiff
|
tree
2008-03-02
Johannes Schin
d
e
lin
format-patch: wrap
c
over-lett
e
r's s
h
ortlog
sensi
b
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Joha
n
n
e
s Schindelin
format-patch:
use t
h
e d
i
ff optio
n
s
for t
h
e
cove
r
letter
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Jakub Narebski
gitweb:
M
ark first ma
t
ch when searching
c
om
m
it messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Juni
o
C Hamano
M
erge branch 'sp/describe-tag'
commit
|
commitdiff
|
tree
2008-03-02
J
u
nio C Hamano
M
e
rge branc
h
'pb/cvsimpor
t
'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
Me
r
ge branch 'jc/maint-log-
m
e
r
g
e-left-right'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
Merge branch 'mh/
m
aint-http-proxy-fix'
commit
|
commitdiff
|
tree
2008-03-02
Ju
n
io C Hamano
Mer
g
e branch 'cb/http-tes
t
'
commit
|
commitdiff
|
tree
2008-03-02
Junio
C Haman
o
Mer
g
e branch
'
jc/rem
o
te-
m
ulti-url'
commit
|
commitdiff
|
tree
2008-03-02
Junio C H
a
m
a
no
Merge branch
'jn/gitweb-grep'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
Me
r
ge branch 'm
k
/maint-parse-
c
a
r
eful'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
M
e
rge branc
h
'
s
b/
d
escribe-long
'
commit
|
commitdiff
|
tree
2008-03-02
Junio C
H
amano
Mer
g
e bran
c
h 'ew/maint-svn-cert-fileprovider'
commit
|
commitdiff
|
tree
2008-03-02
J
u
nio C
Hamano
Merge
b
r
anc
h
'j
s
/main
t
-daem
o
n'
commit
|
commitdiff
|
tree
2008-03-02
Jaku
b
N
areb
s
ki
Documentat
i
o
n
: Remo
v
e
--{min,max}-age opt
i
on
f
r
o
m git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Den
i
s Cheng
cleanup: remove u
n
used git_checkout_c
o
nfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
J
o
hannes Schin
d
elin
Fix make_abs
o
lute_path() for
parameter
s
without a slash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Junio
C
H
amano
diff: make sur
e
wor
k
tr
e
e side
i
s
s
hown as 0{40} when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Junio
C
Hamano
diff-lib
.
c: const
n
ess
stren
g
th
e
n
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
Clean up find_unique_abbrev() cal
l
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Junio C Haman
o
f
i
nd_u
n
ique_abbrev
(
): r
e
define
semantics
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Mike Ho
m
mey
g
it rebase -
-
abo
r
t:
a
lw
a
y
s restor
e
t
h
e right commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Mike Hommey
D
o
c
umentat
i
on/git-rebase
.
txt
:
Add
-
-s
t
rategy to synopsys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
CodingGuide
l
ines:
spell
o
ut how we use
g
rep in our
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Nicolas
Pitre
ad
d
sto
r
age size outpu
t
to '
g
it
v
er
i
f
y
-pack
-v'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Nico
l
as Pitre
fix un
i
mp
l
e
men
t
ed packed_object_info_d
e
tail() features
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Nicola
s
Pitr
e
make ve
r
i
f
y_one_pack
(
) a
b
it less wrong wr
t
pa
c
ke
d
_git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Nicolas Pitre
f
a
ctori
z
e
revindex code out
of builtin-pack-obj
e
cts
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Je
f
f K
i
ng
allow git-am to ru
n
in a subdir
e
cto
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Jeff King
rename: warn user when we
h
ave turned of
f
rename detection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Mike Homm
e
y
Add test for git rebase --abort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
J
unio C Hamano
t6024: move "
g
it
reset" to prepare for a test inside
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Frank Licht
e
nheld
g
c: A
d
d --quiet option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
P
h
i
l
ippe Bruhat
.
.
.
cvsimport:
d
ocum
e
nt
th
a
t
-M
c
a
n
b
e used multiple tim
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Philippe
B
ruhat
.
.
.
cvsimport: allow
for mult
i
p
l
e
-M
o
ptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Philippe
Bruh
a
t
.
.
.
cv
s
import: have def
a
ul
t
merge r
e
gex allow for dashes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
J
u
nio C Ham
a
n
o
Merge br
a
nch '
m
ast
e
r' of g
i
t://repo
.
or
.
c
z/
g
it-gui
commit
|
commitdiff
|
tree
2008-03-01
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-01
Mik
e
Ralphso
n
D
o
c
u
mentat
i
on cherry-pick: Fi
x
cut-and
-
paste
e
r
ror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Rém
i
Vanicat
git
.
el: find the git-status
b
uffer whatever its name is
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Junio C Hamano
Merge branch 'maint
'
of git://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
next