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 second testcase for handling invalid strategies in git-merge
2008-07-30
Miklos
V
ajna
Add a second testcase for handlin
g
invalid strategies
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a new tes
t
for using a custom merge strategy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
o
s
Va
j
na
builtin-merge:
allow using a cu
s
t
o
m strat
e
gy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-help: make some internal
f
unctions a
v
ai
l
abl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Alex Riesen
M
a
ke use of stat
.
ct
i
me configurabl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Christian
Couder
merge-base: die wit
h
an error message if not passed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Junio C
H
ama
n
o
t7001: fix
"git mv"
t
e
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
J
unio C Hamano
Documenta
t
ion:
c
larify what is shown
i
n
"git
-
ls-files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Stef
f
en Pro
h
a
s
ka
run-command (Windows): Run dashle
s
s "gi
t
<cmd>
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Steffen Pr
o
haska
R
e
fac
t
or,
adding pr
e
p
are_git_cmd(co
n
st char **argv)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Ol
i
vi
e
r Marin
bu
i
ltin-verify-tag
:
fix -v option parsi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Hamano
ls-tree documentat
i
o
n: e
n
han
c
e notes on subdi
r
e
c
tory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Hamano
Allow i
n
s
ta
l
ling in
the
tradition
a
l wa
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Junio
C H
a
ma
n
o
All
o
w
building withou
t
any gi
t
installed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Je
f
f
K
ing
init: handle e
m
p
t
y "template" parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
J
u
nio C Hamano
GIT 1
.
6
.
0-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Petr
B
a
udis
gi
t
-mv:
K
e
e
p moved index entries in
a
ct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
P
e
t
r Baudi
s
git-
m
v: Remove d
e
ad co
d
e b
r
anch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Sh
a
wn O
.
Pearce
fsck: Don't require tmp_ob
j
_
f
ile names are 14
b
ytes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
J
o
han
n
es
S
chindelin
Avoid chdir() i
n
list_commands_in_dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Lars Hjemli
bu
i
ltin-branch:
f
ix -v for --[no-
]
merged
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Lars
Hjemli
b
u
ilt
i
n-
b
ranch: factor out merge_filt
e
r
matchi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Lars Hjemli
builtin
-
branc
h
: remove duplicate
d
code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Björn Stein
b
rink
rev-p
a
rse: Add supp
o
rt for
t
he ^! a
n
d ^@ syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Hamano
make sure parsed wildcard refspec
e
n
ds w
i
th
slash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Jakub Nar
e
bski
gitweb
:
More
about how gitweb
g
ets 'owner' o
f
repository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Jonathan Nied
e
r
t6030 (bisect): work arou
n
d Mac OS
X "ls"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
C
e
sar Eduard
o
Ba
r
ros
Docu
m
e
n
tatio
n
/git-submodule
.
txt
:
fix dou
b
led word
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Lee
Marlow
bash com
p
l
etion: Add c
o
mpletion for 'gi
t
help'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Anders Melchiorsen
Documentation: fix di
f
f
.
external ex
a
m
p
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
T
h
omas Ras
t
bash
completion: Ad
d
long options
f
or 'git des
c
r
i
b
e'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Abhijit Menon-Sen
C
l
a
rify that
"gi
t
log x
.
c y
.
h" lists commits
that touch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Ju
n
io C Hama
n
o
Merge git://repo
.
or
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
2008-07-26
Stephan B
e
y
e
r
git-re
s
e
t
:
Let -q
hush
"
l
oc
a
lly mod
i
fied" messag
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
B
r
a
d
K
i
ng
git-svn:
teac
h
d
c
omm
i
t a
b
out svn auto-props
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
J
o
hann
e
s Sixt
Windows: Do not compil
e
g
i
t
-
s
hell
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
J
o
h
a
nnes Sixt
Windows: Ma
k
e sure
argv[0] has a path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johan
n
es S
i
xt
Windows: Make $(g
i
texecdir)
relative
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
J
oha
n
n
e
s Sixt
A
llow add_pat
h
() to add non
-
existent directories to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Allow the built-in exec pat
h
to be re
l
a
t
i
v
e
to t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Fix relative built-i
n
paths
to be relative to the command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johann
e
s S
i
xt
Re
c
ord the
command invoca
t
ion path
early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Joh
a
nnes Sixt
Makefil
e
: Normalize $(
b
i
n
dir) and $(git
e
xecdir) befo
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
J
o
hannes S
i
xt
Makefile: Do not in
s
tall a c
o
py of 'git' in $(gitexecdir)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Rene Scharfe
a
r
c
h
i
ve:
a
llow --exec an
d
--remote withou
t
eq
u
al sign
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Re
n
e Scharfe
archive
:
declare struct archiver whe
r
e
i
t's nee
d
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Rene Scharfe
a
rc
h
ive:
defi
n
e MAX_ARGS
w
here it's needed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
R
e
ne Scharfe
ar
c
hive
:
move parameter parsing
c
ode to
ar
c
hive
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Rene S
c
harfe
archive
:
a
dd wri
t
e_ar
c
hive()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Steve Hasla
m
Rem
o
ve
references to git-fetch-pa
c
k from
"git cl
o
ne
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Stephan
B
eyer
git-am:
Mention --abort in u
s
age string part of OPTIONS_
S
PEC
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Steve Haslam
Prop
a
gate
-
u/--upload-pack o
p
t
i
on
of "
g
it clone" to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
St
e
phan
B
eyer
edit
o
r
.
c: Libify laun
c
h
_
ed
i
tor(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
S
t
eph
a
n Be
y
er
Move launch_editor() from b
u
iltin-ta
g
.
c to editor
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Junio C
Ham
a
no
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hama
n
o
Documentation: cl
a
rify how to disable elements in core
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Jun
i
o C Hamano
Makefile:
fix she
l
l quoting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Junio C
H
am
a
no
t
e
sts: propagat
e
$(TAR) down f
r
o
m
the
t
o
p
lev
e
l
Make
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Björn S
t
einbrink
in
d
ex-
p
ack
.
c: correct
l
y
in
i
tialize app
e
nded objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
P
e
ter Val
d
emar Mørch
se
n
d
-email: fin
d
body
-
e
ncoding correc
t
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Jonathan Nieder
document that gi
t
-tag
can tag more than head
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
B
randon Casey
per
l
/Makefile: update N
O
_PERL_MAKEMAKER section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
SZEDER
Gábor
bash: off
e
r only
p
aths aft
e
r '
-
-'
f
or 'git c
h
eckout
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
SZEDER Gábor
chec
k
out:
mentio
n
'--' i
n
th
e
docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Junio
C Ham
a
no
Merge b
r
anch 'p
h
/checkout'
commit
|
commitdiff
|
tree
2008-07-25
Pierre Habo
u
zit
git-che
c
kout: improv
e
error
m
es
s
ages,
d
e
t
e
c
t
ambigui
t
ies
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
O
l
ivier Marin
update te
s
t
c
ase to protect am --skip behavio
u
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Brandon C
a
sey
Teach fsck an
d
prune abo
u
t
the n
e
w
l
oc
a
ti
o
n
o
f temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-24
Junio
C
Hamano
Merge
b
ranch 'mai
n
t' into ph/c
h
e
ckout
commit
|
commitdiff
|
tree
2008-07-24
Stephan Beyer
Make non-s
t
atic fu
n
ctions
,
tha
t
may be static, st
a
tic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-24
Jun
i
o
C H
a
mano
ignore n
o
n-exis
t
ent re
f
s in dwim_log
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-24
Thomas Rast
gi
t
-completion
.
bash:
provi
d
e com
p
l
etion fo
r
'show-br
a
nch'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-24
L
ee Marlow
bash compl
e
tion: Add long
o
ptions
for '
g
it rm'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
P
.
Christeas
svni
m
po
r
t: ne
w
er l
i
bsvn want
s
us t
o
a
s
k for the
r
o
o
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
P
e
t
r
Baudis
Doc
u
me
n
t
a
tion/git-filter-bra
n
ch
:
teach "rm"
i
nstea
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Johannes Schindelin
g
it d
a
emon: avo
i
d
waking
u
p too often
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Joh
a
nnes Schindelin
builtin-com
m
it: Two tr
i
vial sty
l
e-cle
a
n
ups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Juni
o
C
Hamano
Docum
e
ntation: clarify
diff -
-
c
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
S
t
ep
h
a
n
Beyer
am --abort:
A
dd t
o
ba
s
h-completion and mention in
g
it
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Petr Bau
d
is
git-
f
ilter
-
bran
c
h
.
sh: All
o
w runn
i
ng in bare
r
e
positor
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Junio C H
a
mano
builtin-
b
r
a
nch
.
c: o
p
t
imize --merged a
n
d
--
n
o-mer
g
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Ju
n
io C Hamano
builtin-branch
.
c: remove u
n
used code in append_ref
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
stash s
a
v
e
:
fix parame
t
er h
a
ndling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Step
h
an
Beyer
g
i
t-am: Add
colo
n
before the subject th
a
t is print
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Pi
e
rre
H
abo
u
zit
git-c
h
ec
k
out: fix command li
n
e
parsin
g
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Johann
e
s Sixt
re
b
ase -i
:
When an
'edi
t
'
stops, m
e
ntion the commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Johan
n
es Sc
h
indel
i
n
so
r
t
_in_topological_
o
rder(): av
o
id
setting
a commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Joh
a
n
n
es
Schindeli
n
Add test
to sho
w
that sh
o
w
-
b
ranch misses out the
8
th
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Johannes Schindeli
n
Ignore dirty submodule states in "git pull --rebase"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Brandon Casey
t/t4202-lo
g
.
sh: add newline
at end of file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Brandon Casey
t7502-commi
t
.
sh: rearr
a
n
ge t
e
st to
ma
k
e more portable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Brandon Casey
t
3
200,
t
7201: replace '
!
' w
i
th test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
B
randon Casey
t4116-apply-reverse
.
s
h: use
$
TAR ra
t
her
t
han
tar
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Brando
n
C
a
sey
t/: Replace di
f
f [-u|-U0] with te
s
t
_cmp to allow compilation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos V
a
j
na
t7
6
01: extend
t
he 'merge pi
c
k
s up the best re
s
ult'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Daniel Barkal
o
w
In perforce, RCS keywords are case-sensit
i
ve
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Alex Riesen
Allow p
a
ger of diff command be
ena
b
led
/
disabled
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Johanne
s
Schindelin
Fix two
l
eftovers from p
a
t
h_list->s
t
ring_list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Olivier M
a
rin
g
i
t am -
-
s
k
ip: cle
a
n the index while preserving local
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Pierre Habo
u
zit
git-submodule
:
m
ov
e
ill placed
s
hift
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next