repo.or.cz
/
git
/
mingw
/
4msysgit.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 Va
j
n
a
Add a
new test for
using a cu
s
tom merge strategy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajn
a
builtin-merge: allow usin
g
a
custom
strategy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
b
u
iltin-h
e
lp: make some inter
n
al fu
n
ctions availabl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Alex Ri
e
s
en
Make use of stat
.
ctime c
o
nfigura
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
C
hristian Couder
merge-ba
s
e: die
w
ith
a
n e
r
r
or message if not passed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
J
un
i
o
C Hamano
t7001: fix "git mv" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Hamano
Docume
n
t
a
t
i
on: cl
a
rify what is sho
w
n in "git-
l
s-files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Ste
f
fen
Prohaska
run-
c
o
m
mand (Win
d
ows): Run dash
l
ess "gi
t
<cmd>"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Steffe
n
Prohaska
Refa
c
tor,
add
i
ng prepare_git_cmd(const
char **argv)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Olivier Ma
r
in
builtin-verify-tag:
fix
-
v optio
n
parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
J
u
n
i
o
C Hamano
ls
-
tree documentati
o
n:
e
nhance notes on subd
i
rectory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Junio
C
Hamano
Allow in
s
t
allin
g
in the
t
raditi
o
nal way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Junio C
H
a
mano
All
o
w building without
any
git inst
a
ll
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
J
eff Kin
g
init: handle empty "temp
l
ate
"
parame
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
J
unio C Hamano
G
I
T 1
.
6
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Petr Baudis
git-mv:
Keep moved i
n
de
x
entri
e
s inact
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Petr Bau
d
is
gi
t
-mv: Remove dead c
o
d
e
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
_
obj_ f
i
le names are 14 byte
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Jo
h
a
n
n
e
s S
c
hin
d
el
i
n
Av
o
id chdir() in list_commands
_
in_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Lars
Hj
e
mli
builtin
-
branch: fi
x
-v f
o
r
--
[
n
o
-]m
e
r
ged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Lars Hjemli
b
u
ilti
n
-br
a
nch: facto
r
out me
r
g
e
_filte
r
matching
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
L
a
rs Hj
e
mli
bui
l
tin-br
a
nch: remov
e
d
u
plicat
e
d code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Bjö
r
n S
t
einbrink
rev-pa
r
se: Ad
d
support for t
h
e ^!
a
nd ^@ syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio C Hamano
make sure
parsed w
i
l
d
c
ard ref
s
pec ends with slash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Jakub Narebski
g
i
twe
b
: More about how
g
itweb
g
ets 'owner' of re
p
o
si
t
ory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Jonath
a
n Niede
r
t6
0
30 (bisect): wo
r
k arou
n
d Mac OS X "ls"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
C
e
s
ar Eduar
d
o Barros
Documentat
i
on
/
git-s
u
b
m
o
dule
.
t
x
t
: fix doubled
word
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Lee Marl
o
w
bash com
p
letion:
A
d
d completion for 'git help
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Anders Melch
i
orsen
Documentatio
n
: fix diff
.
e
xternal
e
x
am
p
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Thomas
Rast
ba
s
h
c
o
mpletion: Add long options f
o
r 'git describe'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
A
b
hijit Menon-Sen
C
l
arify that "git log x
.
c y
.
h" lists commits that to
u
ch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Junio
C
Haman
o
Merge git://repo
.
o
r
.
c
z
/
g
it-gui
commit
|
commitdiff
|
tree
2008-07-26
S
tephan Beyer
g
i
t-reset: Let -q hush
"
locally modified"
m
essages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Brad K
i
ng
git-s
v
n:
t
each dcomm
i
t abo
u
t svn aut
o
-props
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Jo
h
an
n
es
S
i
xt
W
indows: Do not com
p
i
le
g
it-s
h
ell
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes
S
ixt
Windows: M
a
ke su
r
e argv[0] has a path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Joh
a
nn
e
s
Sixt
Windows: Make $(git
e
xe
c
dir) relati
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes S
i
xt
Allow
add
_
pa
t
h() to add non-ex
i
stent
d
i
r
e
ctories to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes
Sixt
Allow the built-in exe
c
pa
t
h to b
e
relative
t
o the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes
S
ixt
Fix rela
t
i
ve built
-
in paths to be rela
t
ive
t
o
the
command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Record
t
h
e
comman
d
inv
o
cation path e
a
rl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes
S
i
xt
Makefile: Normali
z
e $(bin
d
ir)
and $(gitexecdir) before
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes
Sixt
Makefi
l
e: Do not i
n
s
tall a copy of 'git' in
$
(gitexecdir)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Rene Sch
a
r
fe
archive: all
o
w --exec and
-
-re
m
ot
e
w
i
t
h
o
ut equa
l
sign
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Rene S
c
har
f
e
archive: dec
l
are s
t
ruct ar
c
hiver
where it's needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Rene Sc
h
arfe
arc
h
ive: d
e
fi
n
e
M
AX_ARGS where it's neede
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
R
e
ne Scharfe
archive: move
p
ara
m
eter parsin
g
c
o
de
t
o a
r
c
hive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
R
e
ne Scharfe
a
rchive:
add write_
a
rchive()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
S
t
eve Haslam
Remove refer
e
nce
s
to git-fet
c
h-
p
a
ck from "git
c
lo
n
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Stephan Beyer
git
-
am: Mention --abort in usage strin
g
part of OPTIONS_SPEC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Ste
v
e Haslam
Pr
o
pa
g
ate -u/--upload-pack opti
o
n of "
g
i
t
cl
o
n
e" to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
St
e
p
han Beye
r
editor
.
c:
Libify launch_editor()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Stephan Beyer
M
ove launch_editor() f
r
om b
u
i
lti
n
-tag
.
c
to editor
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
J
unio
C
Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-07-25
Junio C
H
ama
n
o
Docum
e
ntatio
n
: clarify how to disab
l
e elements in c
o
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hama
n
o
Makefile: fix shell
q
uo
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio
C Hamano
t
e
sts: propaga
t
e $(TAR) do
w
n from the toplevel Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Björn
S
te
i
n
b
r
ink
index-pack
.
c: correctly initializ
e
a
ppende
d
o
b
j
e
c
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
P
eter Valdemar Mørch
s
end-email: find bod
y
-encoding correc
t
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Jonatha
n
Nieder
document
t
hat g
i
t
-
tag
c
a
n tag more than
h
eads
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Brandon Casey
perl/Makefile: upd
a
te 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 onl
y
paths after '--' for 'git checkout'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
SZEDER Gábo
r
check
o
ut:
m
ention '--' in the docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Ju
n
io C Hamano
Merge
b
r
a
nch
'
ph/ch
e
ckout'
commit
|
commitdiff
|
tree
2008-07-25
Pierre
Habou
z
it
git-
c
heckout: imp
r
ove error m
e
s
s
a
ges, de
t
ect ambigu
i
ti
e
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Olivier Marin
update test case to p
r
o
t
ect am --skip
b
ehaviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Brando
n
Casey
Teach fsc
k
and prune about the new locat
i
on
of temp
o
rary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Junio C Hamano
Merge b
r
an
c
h 'maint' i
n
to ph/checkout
commit
|
commitdiff
|
tree
2008-07-24
S
t
ephan Beyer
Mak
e
non-
s
tatic
functions, that may be static, static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Juni
o
C
H
amano
ignore non-exist
e
n
t
r
e
fs in d
w
im_lo
g
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Thomas
R
as
t
git-completion
.
bash
:
provide
com
p
letio
n
for 'show-branch'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Lee Mar
l
ow
bash
c
o
mpletion:
A
dd long options for '
g
it r
m
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
P
.
Christeas
svnimport: n
e
w
er libsvn
wan
t
s us to
ask for the
r
o
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Petr Baudi
s
Document
a
tion
/
gi
t
-filter-b
r
anc
h
: teach "rm" instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Johannes Sch
i
n
de
l
in
g
i
t
daemon: a
v
oid
waking up too often
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
J
o
h
a
nnes Schindelin
buil
t
in-commit: Two trivial
s
tyle-cleanups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
Documentation: clarify diff --cc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Stephan Bey
e
r
am --abor
t
: Add to
b
ash
-
co
m
plet
i
on and
mentio
n
in git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Petr Baud
i
s
gi
t
-filter-branch
.
sh:
Al
l
ow running
i
n bare repositories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
J
unio C Haman
o
builtin-branch
.
c: opt
i
mize --m
e
rged a
n
d
-
-n
o
-merged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Jun
i
o C Ha
m
ano
built
i
n-branc
h
.
c: remove unused
co
d
e in append_ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hamano
stash save: fix parameter handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Ste
p
h
a
n Beyer
git-am
:
Add colon bef
o
r
e
the subject tha
t
i
s
pr
i
nted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
P
ierr
e
Hab
o
uzit
git-check
o
ut: fix
c
ommand line parsing
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
J
o
hannes
S
i
x
t
rebase -i: When an
'edit'
stops, mention the co
m
mi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Joha
n
n
es Schin
d
elin
sort_in_topological_o
r
de
r
(): a
v
oid setting a
c
ommit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
J
ohannes Schindel
i
n
Ad
d
test to show that show-
b
ranch misses out the
8th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Johannes
S
chindel
i
n
Ignore dirty sub
m
odule states in "git pull --
r
ebase"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Bran
d
on
C
asey
t
/
t42
0
2-log
.
sh: ad
d
n
e
wline at end of
f
ile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brandon Ca
s
ey
t7502-commit
.
sh: rearrange test to
m
ake more portabl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Bran
d
on Casey
t3
2
00,t7201:
replac
e
'!' with test_mus
t
_
fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Bra
n
do
n
Casey
t4116-appl
y
-reverse
.
sh: use $TAR rather than tar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brando
n
Casey
t
/
: Repla
c
e diff [-u|-U0]
w
i
th test_cmp to
a
llow comp
i
lat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Mikl
o
s Vajna
t760
1
: extend the 'merge pi
c
ks up
t
he best result'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Daniel Barkal
o
w
In per
f
orce, RCS
k
eywords are
c
a
s
e-sensitive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
A
lex Riesen
Allow
p
ager of dif
f
comman
d
b
e enabled/disabled
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Johannes Schi
n
de
l
in
Fix two leftovers
f
rom
p
ath_l
i
st
-
>
string
_
list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Olivier Mari
n
git am --skip: clean the index while preserving local
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Pie
r
r
e Habouzit
git-submodule:
m
ove ill
p
lace
d
shift
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Pierre Habouzit
built
i
n-me
r
ge:
a
dd missing structure
initialization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next