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
Add a new test for using a custom merge strategy
2008-07-30
Mi
k
los Vaj
n
a
Add
a
new test
f
or using a custom merge st
r
ategy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builti
n
-merge:
a
llow us
i
ng a c
u
stom strategy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
b
u
i
lti
n
-help: make
s
o
m
e intern
a
l fun
c
tions available
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Alex
R
ies
e
n
Make us
e
of stat
.
ctime configurable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Christian C
o
ud
e
r
merge-base:
d
i
e
with
a
n er
r
o
r
message if n
o
t passed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
J
unio C
Hamano
t
7
001: fix "git mv"
test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Hamano
Documentatio
n
: clarif
y
wh
a
t
is s
h
own in "g
i
t-ls-files
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Steffen Pro
h
aska
run-command
(W
i
nd
o
ws):
Run dashle
s
s "git <c
m
d>"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
S
t
effen Prohask
a
R
ef
a
ctor, add
i
ng
p
repare
_
git_cmd(co
n
st
c
har **argv)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Olivier Marin
b
u
iltin-verif
y
-tag: fix -v option pa
r
si
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-29
Ju
n
io C
H
amano
ls
-
tre
e
documentation: enhance notes on s
u
b
d
i
re
c
tory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
J
u
n
io
C Hamano
A
llow
install
i
n
g
in the traditi
o
n
al way
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Ha
m
ano
Allow building w
i
thout a
n
y git ins
t
all
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-28
Jeff King
init: handle
empty
"
template"
paramet
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Jun
i
o C Hamano
GIT 1
.
6
.
0-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
P
e
tr Baudis
git-mv: Keep moved
i
ndex entries inact
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Petr B
a
udis
git-mv: Rem
o
ve dead code branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Shawn
O
.
Pearce
f
s
ck:
D
on
'
t require tmp_ob
j
_
f
i
le
n
ames are 1
4
b
y
tes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
J
o
hannes Schindelin
Avoid chdir() in
list_commands_in_dir()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Lar
s
Hjemli
builtin-b
r
anch: fix -v f
o
r --[no-]merged
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Lars Hje
m
li
builtin-br
a
nch: fa
c
tor out merg
e
_filter
matching
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
L
ars Hjemli
builtin-bra
n
ch:
remove dupl
i
c
a
ted
c
o
de
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Björn Ste
i
nbrin
k
rev-parse: Add s
u
pport for
the ^! and ^@ syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Hamano
make sure parsed w
i
ldcard ref
s
pec ends wi
t
h slash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Jakub Na
r
e
bsk
i
gitw
e
b: More
a
b
ou
t
how gitweb gets 'owner' o
f
reposito
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Jonatha
n
Niede
r
t6030 (bisect):
work around
M
ac OS X
"ls"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
C
e
sa
r
Ed
u
a
r
do Barr
o
s
Doc
u
mentation/
g
it-su
b
modu
l
e
.
txt:
f
i
x double
d
word
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Lee Marlow
ba
s
h
co
m
pletion: Add comple
t
i
o
n
fo
r
'git help'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
And
e
rs Me
l
c
h
iors
e
n
Doc
u
mentatio
n
: fix diff
.
exter
n
al
e
xam
p
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Thomas Rast
bash completio
n
: Add lo
n
g
o
pt
i
ons
f
o
r
'gi
t
descr
i
be'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
A
bhijit Menon-Sen
C
larify
that "git log x
.
c
y
.
h" li
s
t
s
commi
t
s
that touch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-27
Ju
n
io C Haman
o
Merge
git://repo
.
or
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2008-07-26
Step
h
a
n
Beyer
git-reset: Let -q
hush "locally modifie
d
" messag
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Brad King
g
it-
s
vn: te
a
c
h d
c
om
m
it about svn au
t
o-props
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
J
o
h
a
nnes
S
ixt
Window
s
: D
o
no
t
compile git-shell
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
J
o
hannes Sixt
Windows: Make sure argv[0]
has a path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Jo
h
annes Sixt
W
in
d
ows: Make $(git
e
xecdir
)
relative
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johannes
Sixt
Allow add_pat
h
()
t
o add non-existent
d
irectories to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johanne
s
Six
t
Al
l
ow the built
-
in e
x
ec path to be relative to the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johann
e
s Sixt
F
i
x relative built-in paths
t
o be relativ
e
to the
c
o
m
m
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johann
e
s Sixt
Record t
h
e c
o
mmand invocat
i
o
n
p
a
th early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Si
x
t
Ma
k
efile: Normalize $(bindir
)
and $
(
gitexecd
i
r)
b
efo
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Makef
i
le: Do not
i
nstall a copy
of 'git' in $(gitexe
c
d
ir)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Re
n
e
S
charfe
archive: all
o
w -
-
exec and --remote with
o
u
t e
q
ual sign
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
R
e
ne Scha
r
fe
arch
i
ve: decla
r
e stru
c
t
a
rchi
v
er w
h
ere
i
t's n
e
eded
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Rene Scharfe
archive: define MA
X
_ARGS where i
t
's n
e
eded
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Rene
Scharfe
arch
i
ve
:
move parameter
parsing code
to
a
r
chive
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
R
e
ne Scha
r
f
e
archive: add write_archive()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Steve Haslam
Remove refer
e
n
c
es to g
i
t-fetch-pack from "gi
t
clone
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Stephan
Beyer
git-
a
m: Mention --abort
in
u
sage string
p
art o
f
O
PTION
S
_SPEC
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
St
e
ve Haslam
Propagate -u/--upload
-
pack opt
i
o
n
o
f "git clone" to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Stephan Bey
e
r
edit
o
r
.
c: Li
b
ify
l
aunch_edito
r
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-26
Stephan Beyer
Mo
v
e launch_editor() from
builtin-tag
.
c t
o
editor
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
J
unio C H
a
mano
M
e
rge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-07-25
Junio C
H
amano
Docu
m
en
t
ation:
cla
r
ify h
o
w to disable
el
e
me
n
ts
i
n core
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Ha
m
ano
Makefile: fix
sh
e
ll quoting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
tests: propagate
$(TAR) down from the toplev
e
l Makefil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
B
j
örn Steinb
r
ink
index-pack
.
c: correctly initi
a
lize 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
send-email:
find
body-encoding corr
e
ctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Jonathan Nieder
documen
t
that
git-tag can tag more than heads
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Brandon Casey
perl/Makefile: update NO
_
PE
R
L
_MAKEMAKER section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
SZEDER Gábor
b
ash: offer only
path
s
afte
r
'--' f
o
r 'git checkout'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
S
ZEDER Gáb
o
r
checkout
:
mention '--' in the docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Junio
C
Hamano
Mer
g
e
b
ran
c
h 'ph/checkout'
commit
|
commitdiff
|
tree
2008-07-25
Pi
e
rre
Hab
o
uzit
git-checkou
t
: im
p
rove error
messag
e
s, detec
t
amb
i
guities
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
O
l
i
vier
Marin
update test cas
e
to protect am --skip behaviour
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-25
Bran
d
on Cas
e
y
Te
a
ch fsck
a
n
d p
r
u
n
e about the new
location
of te
m
porary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-24
Junio C Ha
m
a
n
o
Merge b
r
a
n
c
h
'maint' i
n
to
ph/checkout
commit
|
commitdiff
|
tree
2008-07-24
Stephan Be
y
er
Make non-stati
c
functio
n
s, that may be static, static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-24
Junio C Hamano
ignore non-existent ref
s
in dwi
m
_log()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-24
Thoma
s
Rast
gi
t
-com
p
let
i
on
.
bash:
p
rovide co
m
pl
e
tion
f
or 'show-branc
h
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-24
Lee Mar
l
ow
bash completion: Add long options for 'git rm'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
P
.
Christ
e
a
s
svnimport: newer libsvn w
a
nts
u
s to as
k
for the root
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Petr Baudis
Documentation/git-filter-branch: teac
h
"rm" instead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
J
o
ha
n
ne
s
Sc
h
indel
i
n
git daemo
n
: a
v
oid waking
u
p too often
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Johannes S
c
hind
e
lin
bu
i
ltin-commit: Two trivial style-cleanups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Ju
n
i
o
C H
a
mano
Documentation: clar
i
fy diff --cc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Stephan Beyer
am --a
b
ort: Add t
o
b
ash-completion a
n
d mention
i
n git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
P
etr Bau
d
i
s
git-f
i
lter-
b
r
a
nch
.
s
h: A
l
low running in
b
ar
e
repo
s
itories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
builtin-branch
.
c:
o
ptimize -
-
m
e
r
g
e
d and
-
-
no
-
merg
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
J
unio C Ham
a
no
buil
t
in-bra
n
ch
.
c: remo
v
e unused code in appen
d
_ref
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Jun
i
o
C
Hamano
stash save
:
fix parameter ha
n
dl
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Stephan Beyer
git-am:
A
dd colon before the subject
t
hat i
s
printed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Pi
e
rre
Habo
u
zit
git-checkou
t
: fix command line p
a
r
sing
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Johannes Si
x
t
rebase -i: W
h
e
n an
'
edit' stops, mention the commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Joha
n
nes Schinde
l
in
sort_in_topol
o
g
i
cal_order(): av
o
id
settin
g
a
c
ommit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
J
o
ha
n
nes
Schindelin
Add test to show that show-branch mis
s
es o
u
t the 8th
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Joh
a
nnes S
c
hindelin
Ignore di
r
ty
submodul
e
stat
e
s
in "git pul
l
--rebase"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
B
r
andon Casey
t/t4202-log
.
sh
:
a
dd newline at
e
nd of
f
ile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
B
r
ando
n
Cas
e
y
t
7
502-commit
.
s
h
: rearr
a
nge te
s
t to make m
o
re portable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Brandon
Casey
t3200,
t
7201: replace
'
!' with test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Brandon Ca
s
e
y
t4116-apply-r
e
verse
.
sh
:
use $TAR rather tha
n
tar
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Brando
n
Casey
t/:
Rep
l
ace diff [-u|-U0] with test_cm
p
to allo
w
compilation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Miklo
s
Vaj
n
a
t
7601
:
e
xtend the 'merge picks up
t
he be
s
t
result'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Daniel Ba
r
kalow
In per
f
orce,
R
CS keywords ar
e
case
-
sensitive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-23
Alex
Ri
e
sen
Al
l
ow p
a
ger o
f
di
f
f
comman
d
be enabled/
d
isab
l
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Joha
n
n
es Schindelin
Fix
t
wo leftovers fr
o
m
path_li
s
t->string_list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Oli
v
ier Marin
git am -
-
s
k
ip: cl
e
an the in
d
ex wh
i
le p
r
e
s
e
r
ving local
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Pierr
e
Habouzit
git-s
u
bmo
d
ule: move ill
p
laced shift
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-07-22
Pierre Habouz
i
t
builtin-merge: add mis
s
ing structu
r
e
i
nitialization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next