repo.or.cz
/
git
/
git-bigfiles.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
Mikl
o
s
Vajna
Add a second testcase for handling
i
n
v
a
l
i
d strategi
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vajn
a
Add a ne
w
test f
o
r us
i
ng a custom m
e
rge st
r
ategy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jna
builtin
-
merge: all
o
w usin
g
a custom strategy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajn
a
buil
t
in-hel
p
: make som
e
internal fun
c
tions avail
a
ble
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Alex Riesen
Make
use of stat
.
ctime configu
r
a
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
C
hristian Couder
merge-base
:
d
ie with
an er
r
or message if not
p
a
sse
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
J
unio C Ham
a
no
t7001: fix "g
i
t mv" test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio C
H
amano
Do
c
u
mentati
o
n: clar
i
fy what is sh
o
wn in "git-ls-files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Steffen Prohaska
run
-
c
om
m
and (Windows): Run dashle
s
s
"git <cmd
>
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Steffen
P
r
o
h
a
sk
a
Refactor, adding prepa
r
e_git_cmd(const char **argv
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Oliv
i
e
r Marin
builtin-verify-
t
ag: fix -v option parsing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-29
Junio C Hamano
ls-tree documentation: enhance
notes on
subdirectory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Hamano
All
o
w ins
t
al
l
ing in th
e
t
r
aditional
way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Junio C Hamano
A
llow building without any
g
i
t insta
l
le
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-28
Jeff King
init: handle empty "template" p
a
ram
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
J
u
n
io C Ham
a
no
G
I
T
1
.
6
.
0-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Pet
r
B
audis
git-mv
:
Keep moved index entries
ina
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Petr Baudis
g
i
t
-mv: Remove
d
ead code b
r
anch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Shawn O
.
Pearce
fsck: D
o
n't r
e
quire tmp_obj_ file name
s
a
r
e 14 bytes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Johann
e
s
S
c
h
ind
e
li
n
Avoid
chdir() in list_co
m
m
ands
_
in_di
r
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Lars Hjemli
bui
l
ti
n
-b
r
anch: fix
-v
for --[no-]merge
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Lars Hjemli
builtin-branc
h
: f
a
ct
o
r
o
ut merge_fil
t
e
r
matching
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Lars
Hjemli
buil
t
in-branch
:
remove dup
l
icat
e
d code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Björn Steinb
r
i
n
k
rev-parse: Add
s
upport for
t
he ^! 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 r
e
fspec
e
nds with
s
lash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Jak
u
b Nar
e
bski
gitweb: More about how gitweb g
e
ts '
o
wn
e
r' of repo
s
itory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Jo
n
athan Nieder
t6030 (bisect): work
around Mac OS
X "ls"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Cesar Edu
a
rdo Ba
r
ros
Doc
u
mentati
o
n/git-su
b
module
.
tx
t
: fix
d
oubled wo
r
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Lee Marlow
bash com
p
letion: Add completion for 'git help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
A
n
d
e
rs Melchior
s
e
n
Documentation:
f
ix diff
.
exter
n
a
l
e
xample
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Thomas Rast
b
a
sh
c
o
mpletion: Add
l
o
n
g op
t
io
n
s for 'git
describe'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Abh
i
j
i
t
Menon
-
Sen
Cla
r
ify t
h
at "git lo
g
x
.
c y
.
h
"
l
i
sts com
m
i
t
s
tha
t
touch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-27
Juni
o
C H
a
ma
n
o
Merge git://repo
.
or
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2008-07-26
S
t
ephan
Bey
e
r
git-
r
e
set: Let -q
h
u
sh "locally mo
d
ified" messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Brad King
git-svn: teach dcommit about svn auto
-
props
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Joha
n
nes Sixt
Windows: Do not compile
g
it-
s
h
e
ll
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Six
t
Win
d
ows
:
Make
s
ure argv[0] has a path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes S
i
xt
Wind
o
ws: Make $(gitexecdir
)
r
el
a
tiv
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johan
n
es Sixt
Allow a
d
d_path()
t
o ad
d
non-existent dir
e
c
t
ories to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Six
t
Allow th
e
b
u
i
l
t
-in exe
c
path to b
e
r
ela
t
ive to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Joh
a
nnes
Sixt
Fix relat
i
ve built-
i
n paths to
b
e relative
t
o the command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Re
c
o
r
d
the command invocation path ear
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes
S
i
x
t
Makefile: Normaliz
e
$(bindir)
a
nd $(gitexecdir) before
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Johannes Sixt
Makefile: Do no
t
i
n
stall 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
archive: allo
w
--exec and --remote without equal
s
ig
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Re
n
e Scharf
e
archive: declare struct archiver where it'
s
needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Rene Scharfe
ar
c
h
i
ve: define MAX_A
R
GS wh
e
re it
'
s ne
e
ded
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
R
e
ne Scharfe
archive: move parameter par
s
i
ng c
o
d
e
t
o archive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Rene Scharfe
archive: add wr
i
te
_
a
r
chive()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Steve
H
aslam
Remove
r
efer
e
n
ces to gi
t
-fetch-pack
from
"git clone
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
S
teph
a
n Be
y
er
git-am: M
e
ntion --
a
bort
in
u
s
a
ge
strin
g
part of OPTIONS_SPEC
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
St
e
ve Hasl
a
m
Propagate -u/--upload-pac
k
opt
i
on of "git clone" t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Steph
a
n
Bey
e
r
editor
.
c: Li
b
i
f
y launch_edito
r
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-26
Stephan
Beyer
M
ove launch_ed
i
tor() from builtin-ta
g
.
c to edit
o
r
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Jun
i
o
C H
a
ma
n
o
Me
r
ge bra
n
ch
'
m
ai
n
t'
commit
|
commitdiff
|
tree
2008-07-25
Junio
C
Hamano
D
o
cumentation: c
l
arify how to dis
a
ble
el
e
m
ents i
n
core
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
M
akefile
:
fix shell
quo
t
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio
C
Ham
a
no
t
es
t
s:
p
ropa
g
ate $(TAR) dow
n
from th
e
topl
e
vel Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Bjö
r
n
S
teinb
r
ink
i
n
dex-pack
.
c
: correctl
y
initialize appended objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Pe
t
er Valdemar Mørch
send-em
a
il
:
find body-
e
ncod
i
ng
correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Jon
a
than
Niede
r
docu
m
ent that git-tag can tag more than he
a
ds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
B
randon Ca
s
ey
perl/
M
akefile: u
p
dat
e
NO_PERL_MAKEMAKER se
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
SZEDER
Gáb
o
r
bash: o
f
fer
o
nly paths
a
fter '--' for 'gi
t
ch
e
ckout'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
SZ
E
DER G
á
bor
checkout: mentio
n
'--' in the d
o
cs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Junio C Hamano
Merge b
r
anch 'ph
/
checkout'
commit
|
commitdiff
|
tree
2008-07-25
Pi
e
rre H
a
bouzit
git-checkout: improve error me
s
sages, det
e
ct ambiguities
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Olivier M
a
ri
n
u
pdate te
s
t case to protec
t
am
--skip behaviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-25
Br
a
ndon Casey
Tea
c
h fsck and
p
ru
n
e about
t
h
e
n
ew location
o
f temp
o
rary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Junio C Hamano
Merge bra
n
ch '
m
aint'
i
nto ph
/
checko
u
t
commit
|
commitdiff
|
tree
2008-07-24
Steph
a
n Beyer
Make non-static functions, t
h
at may
b
e
static,
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Juni
o
C Ha
m
ano
ignore non-
e
xistent
refs in dwim_log()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
T
h
o
mas Rast
git
-
completion
.
b
ash: p
r
ovi
d
e compl
e
t
ion for 'show-branch'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-24
Lee M
a
rlo
w
bash completio
n
: Add l
o
ng options f
o
r
'
git rm'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
P
.
Christeas
svnimport: newer
li
b
svn wants
u
s to
ask for th
e
ro
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
P
e
tr Baudis
Docu
m
entati
o
n/git-f
i
lter-br
a
nch
:
t
eac
h
"rm" inste
a
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Johannes Schind
e
lin
git
d
ae
m
o
n
:
a
void wak
i
ng up
too of
t
en
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Joh
a
nnes Schin
d
elin
b
u
il
t
in-
c
o
mmi
t
:
Two trivial
s
t
yle-cleanu
p
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
J
u
n
i
o C Hamano
Documentatio
n
: clarify
di
f
f --c
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Stephan
B
eyer
am
-
-abort: Add to
b
ash-complet
i
on and mention in git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Petr Baudis
git-filter-branch
.
sh: Allow runn
i
ng in bare repositories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hama
n
o
built
i
n-branch
.
c
:
o
p
tim
i
ze --merged an
d
--no-me
r
ged
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Junio C Hama
n
o
builtin-branch
.
c:
r
emove unused
c
ode i
n
append_
r
ef
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Juni
o
C Haman
o
sta
s
h save: fix parame
t
er hand
l
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Stephan
B
e
y
er
git-am: Add colon bef
o
re t
h
e subject
t
hat is printed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
P
i
e
r
r
e
Habouzit
git-c
h
eck
o
ut: fix
command line parsing
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Joh
a
nnes
Six
t
rebase -i: When an 'edit' stops, mention the commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Johannes Schi
n
delin
sort_in_topological_
o
rder(): a
v
oi
d
setting a commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Joha
n
nes Schind
e
lin
A
dd test to show that show-branch misses out the
8
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Johannes Schindelin
Ignore dirty su
b
module sta
t
es in
"
git pu
l
l --rebase"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brando
n
Casey
t
/
t4202-log
.
sh: add
new
l
ine at end o
f
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
B
r
andon Casey
t
7502-commit
.
sh: rearrange
t
e
st to
m
ake m
o
re porta
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brandon
Cas
e
y
t3200,t72
0
1:
r
eplace '!' wit
h
test_m
u
st_fa
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
B
r
ando
n
Casey
t4
1
16-apply-
r
everse
.
s
h: use
$TAR rather than
tar
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Brandon Casey
t
/
: Re
p
l
ace diff [
-
u
|-U0] wit
h
te
s
t_cmp to allo
w
c
o
mp
i
lation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
V
a
jna
t7601: extend the 'merge picks up the best result'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Daniel
B
a
rkalow
I
n
perforce, RCS keywords are case-sensitive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-23
Alex Ri
e
sen
Allo
w
p
a
ger o
f
diff comm
a
nd be ena
b
l
e
d/disabl
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Johannes S
c
hindelin
F
ix two
leftover
s
from p
a
t
h
_li
s
t->string_list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Oliv
i
er Marin
git am
-
-skip: clean
the index while
p
r
e
serving local
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-07-22
Pierre
H
abouzit
git-su
b
m
odule: move ill placed
s
hi
f
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next