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
Add a new test for using a custom merge strategy
2008-07-30
Miklos Vaj
n
a
A
dd a new
test fo
r
using a custom merge s
t
rategy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-me
r
ge: a
l
low using a custom stra
t
egy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
bu
i
lti
n
-h
e
lp:
m
ak
e
s
ome internal functi
o
ns available
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Alex
R
iesen
M
ake
u
se of stat
.
ct
i
m
e c
o
nfig
u
rable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Christian Co
u
der
mer
g
e
-
b
ase: die with an
e
rror message if
not passed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
J
uni
o
C Hamano
t7
0
01: f
i
x "git mv"
t
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Ha
m
ano
Documenta
t
ion: clarify
what i
s
sho
w
n
in "git-ls-files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
St
e
f
fen
P
r
oha
s
ka
run-command (
W
indows): Run
dashle
s
s "gi
t
<cmd>"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
S
teffen Proha
s
k
a
Refactor, adding prep
a
r
e_git_cmd(const char
**argv)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Oli
v
ier Marin
builtin-verify
-
tag: fix -v option pars
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
J
unio C Hamano
l
s-tree docume
n
tation: en
h
ance notes on subd
i
rectory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Hama
n
o
Allow installi
n
g
in the tradition
a
l wa
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Jun
i
o C H
a
m
a
n
o
A
l
low building
w
ith
o
ut a
n
y
g
it
i
nstalle
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Jef
f
King
in
i
t: hand
l
e
e
mpt
y
"temp
l
ate" parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Junio C
H
a
man
o
GIT 1
.
6
.
0-rc
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Petr Baudis
git-mv: Keep moved index entrie
s
inact
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Petr
Baudis
gi
t
-
m
v:
R
emove dead
c
ode b
r
anch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
S
hawn O
.
Pearce
fsck:
D
on't
r
equire t
m
p_obj_
f
ile names are 1
4
bytes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Johannes Schindelin
Avoid
c
hdir() in li
s
t_commands_in_dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
L
a
r
s Hje
m
li
builtin-branch: fix -v for --[no-]me
r
ged
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Lars Hj
e
mli
built
i
n-branch: factor out
m
erge_f
i
lter matching
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Lars Hje
m
li
built
i
n-branch: remove duplicated code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Bj
ö
rn Steinbrink
rev-pa
r
se: Ad
d
supp
o
rt for the ^! and ^@ syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Jun
i
o C
Hamano
m
ake sure parsed wildcard
refspec ends with slash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Jakub Narebski
gitwe
b
:
More about how
gitweb gets 'owner
'
of repository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Jonath
a
n
Nieder
t60
3
0
(
bisect): work aro
u
nd Mac
O
S X "ls"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
C
e
s
ar
E
dua
r
do Barros
Doc
u
men
t
a
t
i
on/g
i
t
-subm
o
dule
.
txt: fix do
u
b
l
ed
w
ord
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Lee Ma
r
low
bash completion: Add completio
n
for 'git help'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
A
n
ders Melchior
s
en
Docu
m
entat
i
on: f
i
x diff
.
e
xte
r
nal example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Thomas Ra
s
t
bash
c
o
m
p
l
eti
o
n: Add long o
p
tions
for 'git d
e
scribe'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
A
b
h
i
jit Menon-Sen
Clarify
that
"
gi
t
l
o
g x
.
c
y
.
h"
l
ists commits that touch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Junio C
Hamano
Merge
git://r
e
p
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-07-26
Steph
a
n Beyer
gi
t
-reset:
L
et -q hush "lo
c
ally mo
d
if
i
ed" messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Brad King
g
i
t-svn: t
e
ach dc
o
m
mit about svn
a
uto
-
props
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Joha
n
nes
S
ix
t
Windows: Do
n
o
t compil
e
git-shell
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johan
n
es
S
ixt
Windows: Make sure
a
rgv
[
0] has a
p
a
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Jo
h
a
n
nes Sixt
W
indow
s
:
Make $(
g
itexec
d
ir) relative
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
J
ohannes S
i
xt
Allow add_pa
t
h() to add
n
on-existent dir
e
ctori
e
s
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Allow the buil
t
-in exec path to be relative
t
o the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Joha
n
nes Si
x
t
Fix
relative built-in paths to be rel
a
t
ive to
t
he command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
J
o
hannes
S
i
x
t
Reco
r
d the
command inv
o
cation path early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Mak
e
file: Normaliz
e
$
(
b
indir)
and
$
(gitexecdi
r
) b
e
f
ore
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johannes
S
ix
t
Make
f
ile: Do
not
i
n
s
t
a
l
l
a copy of 'git' in $(gitexec
d
ir)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Rene Scharfe
ar
c
hi
v
e: al
l
ow --exec a
n
d --remote without equal s
i
g
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Rene Scharfe
archive
:
decl
a
re struct archiver where it's needed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Ren
e
Scharf
e
arc
h
iv
e
: define MAX_ARGS where it's
needed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Rene Sch
a
rf
e
arc
h
ive: move parameter par
s
i
n
g code to archive
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Rene Scharfe
archive: a
d
d wr
i
te_archive(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Ste
v
e Haslam
Remove references to git-fetch-
p
ack from "gi
t
clon
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
S
t
ephan Bey
e
r
git-am:
Menti
o
n --abo
r
t in usage string part of OPT
I
O
N
S_SPEC
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
S
t
eve
H
as
l
a
m
Propagate -u
/
--upl
o
ad-pack option of "
g
it
cl
o
ne" to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
S
tephan Beyer
editor
.
c: Libi
f
y
l
aunch_editor()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Stephan B
e
yer
Mo
v
e lau
n
ch
_
editor() from builtin-tag
.
c to editor
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
Merge branch '
m
aint
'
commit
|
commitdiff
|
tree
2008-07-25
Junio C
H
a
m
a
no
Doc
u
m
entati
o
n: clarify ho
w
to
disable element
s
in core
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Ju
n
io C Hamano
Makef
i
le:
fi
x
shell
q
uoting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Ju
n
io C Hamano
tests:
p
ropagate $(TAR) down
f
r
o
m the toplevel Mak
e
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Björn St
e
inbri
n
k
ind
e
x
-
pac
k
.
c:
c
o
r
rectl
y
initi
a
l
iz
e
app
e
nded objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Peter V
a
lde
m
ar Mørch
send-email: find body-encod
i
ng
c
orre
c
tly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Jonathan Nieder
docume
n
t that gi
t
-tag can tag
more than h
e
a
ds
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Brandon Cas
e
y
per
l
/Makefile:
u
pdate NO_
P
E
R
L_
M
A
KE
M
AKER sec
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
SZEDER
G
ábor
b
ash: offe
r
only paths after '--' f
o
r 'g
i
t checkout'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
SZ
E
D
ER Gábor
checkout: mentio
n
'
-
-' in the docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
J
u
n
i
o C Hamano
Merge branch 'ph/checkout'
commit
|
commitdiff
|
tree
2008-07-25
P
ierre Habouzit
git-checkout
:
i
mp
r
o
ve error messag
e
s, d
e
tect ambiguitie
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Olivi
e
r
Marin
update test case to prote
c
t
am --s
k
i
p behaviour
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Brandon Casey
Teach fsck and
p
rune ab
o
ut the new l
o
c
a
t
i
on of
t
em
p
orary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-24
Junio C
Hamano
Merge branch 'maint' into ph/
c
heckout
commit
|
commitdiff
|
tree
2008-07-24
Ste
p
han Beyer
M
a
k
e
non-static functions, th
a
t m
a
y be
sta
t
ic, static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-24
Junio C Ha
m
ano
igno
r
e non-existent
refs in
d
wim_log()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-24
Thomas R
a
st
git-completion
.
bash: p
r
o
v
ide c
o
mpletion
f
or 'show-branch
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-24
Lee
Marlow
bash co
m
p
letio
n
: A
d
d
lo
n
g opt
i
ons
f
or 'git rm'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
P
.
Chr
i
s
tea
s
svnimport: newer libsv
n
wan
t
s
u
s to ask for t
h
e ro
o
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Petr Baudi
s
Documen
t
ation/git-filter-branch: t
e
ac
h
"
r
m" instead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Johannes S
c
hindelin
git da
e
mon
:
avoid
w
aking up
t
oo ofte
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Johann
e
s Schindelin
bu
i
lti
n
-commi
t
: T
w
o t
r
i
v
i
a
l style
-
cleanups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
J
unio C Hamano
Documentation
:
clari
f
y diff --c
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Stephan Beyer
am
--abort: Ad
d
to bash-c
o
mpletio
n
an
d
m
e
n
t
ion
i
n git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Petr B
a
udis
gi
t
-filter-bra
n
ch
.
sh:
A
llow run
n
ing in bare r
e
positories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
built
i
n-bra
n
ch
.
c:
optimize --merged and --no-merged
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Junio C
Hamano
b
u
ilt
i
n-branch
.
c: r
e
mov
e
u
nused code in a
p
pend_ref
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
sta
s
h sa
v
e:
f
ix parameter handlin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Stepha
n
Beyer
g
i
t-am
:
A
d
d colon
befo
r
e the subj
e
c
t
t
h
at is p
r
inted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Pierre Habouzit
g
it-checkout
:
fix co
m
mand
line
pa
r
sing
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
J
o
han
n
es Sixt
rebase -i: When
an 'edit' stops, mention th
e
com
m
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Johannes S
c
hindelin
sor
t
_i
n
_topological_o
r
der(): avoid
s
etting
a
commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Joha
n
nes
S
chi
n
delin
Add tes
t
to show that show-branch misses out the 8th
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Joh
a
nnes
S
chindelin
Ignore dirty submodule
s
tates in "git p
u
ll
-
-rebas
e
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Bran
d
on Casey
t/t
4
202-log
.
sh: add n
e
wlin
e
at end of
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Brando
n
Casey
t
7
502-com
m
i
t
.
sh
:
rearrange te
s
t to
make
m
o
re portabl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Brandon Ca
s
ey
t3200,
t
7
2
0
1
: replace
'!' with te
s
t_must_
f
a
il
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Brandon Casey
t4116-
a
p
p
l
y-reverse
.
sh: use $
T
AR rather
than tar
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Bran
d
on Cas
e
y
t/: Replace diff [-
u
|
-U
0
]
with test
_
cmp to
allow c
o
mpi
l
ation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t76
0
1: extend
t
he 'm
e
rge picks up the
be
s
t result'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Danie
l
Barkalow
In perforce, RCS keywords are case-sensitive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
A
lex Riesen
Allow pager of di
f
f command
b
e enabled/dis
a
bled
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
J
o
hannes Schindelin
F
i
x t
w
o
l
eftovers fro
m
path_list->string_lis
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Mari
n
g
it am -
-
sk
i
p: clean the index w
h
i
le
p
rese
r
ving local
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Pie
r
re
H
abou
z
it
g
it-subm
o
d
ule: move ill placed shift
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Pie
r
re H
a
b
ouzit
bu
i
ltin-merge: add mi
s
sing structure ini
t
ia
l
iz
a
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next