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-27
Lar
s
Hjem
l
i
bui
l
tin-branch: fix -v for -
-
[no-]merged
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-07-27
Lar
s
Hjemli
builtin-branch: factor out
m
erge_filt
e
r matching
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-07-27
Lars Hjemli
builtin-bra
n
c
h:
r
em
o
ve duplicate
d
c
o
d
e
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-05-12
L
a
r
s
Hjemli
revision
.
c: r
e
ally
h
o
nor --fi
r
st-pa
r
ent
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-21
L
ars Hje
m
l
i
Add
test
s
f
o
r `bra
n
ch --[no-]me
r
ged`
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-21
Lars Hjemli
git-branch
.
txt:
compare --contains, -
-
merged and -
.
.
.
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-21
Lars Hjemli
g
i
t
-branc
h
: a
d
d supp
o
rt for --me
r
ged and -
-
no-merged
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-09
L
a
rs Hjemli
Teach GI
T
-VERSION-GEN about the
.
g
i
t
f
i
le
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-09
L
ars Hjemli
Teach git-submo
d
ule
.
sh about the
.
git file
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-09
L
a
r
s Hjemli
Teach resol
v
e_
g
itlink_ref() abou
t
the
.
gi
t
file
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-09
Lars Hjemli
Add platfo
r
m-
i
ndep
e
nd
e
n
t
.
git "sym
l
ink"
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-02-19
Lars Hjemli
Si
m
plify setup of $GIT_D
I
R
i
n
g
it-sh-set
u
p
.
sh
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-01-18
Lars Hj
e
m
l
i
Move sha
1
_file_to_a
r
chive
i
nto libgi
t
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-11-10
Lars Hj
e
m
l
i
for
-
each-ref
:
f
i
x setup of option-parsing fo
r
--sort
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-10-31
Lars Hjemli
Make merge-re
c
ursive
h
onor di
f
f
.
re
n
amelimit
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-10-29
L
ars
Hjeml
i
Teach git-
p
ull about --[no-]f
f
, --no-squash
a
n
d
--commit
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-26
Lars Hjemli
Make merge-recursiv
e
honor diff
.
rename
l
im
i
t
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-24
Lars Hjeml
i
git-merge: a
d
d --ff and --no
-
ff options
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-24
Lars Hjem
l
i
git-
m
erge: add
s
upp
o
rt for -
-
commit and -
-
no-s
q
uash
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-24
Lar
s
Hjemli
git
-
merge
:
add sup
p
ort fo
r
branch
.
<name>
.
m
erg
e
option
s
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-24
L
ars
Hje
m
li
git-merge
:
re
f
actor option parsing
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-24
Lars
H
jemli
g
it-mer
g
e: fix fault
y
SQUASH_MSG
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-24
Lars
Hj
e
m
li
Add test-sc
r
ipt
for git-m
e
rge porcelain
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-07
L
ar
s
Hjemli
git-svn:
a
lw
a
ys use --
f
irs
t
-parent
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-05
L
a
rs Hj
e
mli
git
-
s
vn: add support for -
-
first-p
a
rent
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-08-17
Lars Hjemli
gi
t
-submodule
:
r
e
-enable 'sta
t
u
s
'
as the defa
u
lt subcommand
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-07-07
Lars Hjemli
git
-
subm
o
dule(1): update description and key na
m
es
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-16
Lars Hjemli
g
itmo
d
ules(5): re
m
ove
leading period from s
y
n
o
psis
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-12
Lars Hjemli
Add gitmodules(5)
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-12
Lar
s
Hje
m
li
git-submodule: gi
v
e subm
o
dules proper
names
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-12
Lars Hjeml
i
Rename sections from "module" to "submodule" in
.
gitmodules
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-12
Lars H
j
e
mli
g
it-s
u
bmodule: re
m
ember to checkout after clone
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-12
La
r
s Hjemli
t7400:
b
arf i
f
git-submodule r
e
moves or
r
epla
c
es
a
.
.
.
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-06
L
ars Hj
e
mli
g
it-su
b
modul
e
: clone du
r
in
g
u
p
d
ate, not d
u
ri
n
g init
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-06
Lar
s
Hjemli
g
it-submodule: m
o
ve
c
l
oning in
t
o a sep
a
rat
e
function
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-02
La
r
s Hjemli
Add basic test-s
c
r
ipt fo
r
git-submodule
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-05-27
Lars Hjemli
Add git-submod
u
le command
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-05-12
Lars Hjemli
g
it-ar
c
hive: don't di
e
when repository uses subprojects
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-04-06
L
a
rs Hjemli
M
ak
e
builtin-branch
.
c handle the
git config file
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-04-06
L
a
rs Hjeml
i
r
e
name_ref():
only pri
n
t a warning when
confi
g
-file
.
.
.
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-01-08
Lars Hjemli
git-branch: show detached HEAD
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
Lars Hje
m
li
R
efa
c
t
o
r print-functions in builtin-
b
ranch
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
Lars
H
j
emli
Skip excess
i
ve blank lines before c
o
mmit body
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-12-06
Lars
H
jem
l
i
git-b
r
anch: let
caller specify lo
g
msg
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-12-06
Lars Hjemli
r
ename_ref:
use lstat(2)
w
hen testing fo
r
s
ymlink
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-12-06
Lars Hjem
l
i
git-branch
:
add o
p
tions and
t
e
s
ts for
br
a
nch ren
a
m
i
ng
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-11-25
Lar
s
Hjem
l
i
Add -v
a
nd --abbrev o
p
tions to
git-b
r
anc
h
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-10-27
La
r
s Hjemli
Fix show-ref us
a
gestring
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-10-24
Lars Hjemli
Make g
i
t-branch a builtin
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-10-22
La
r
s
H
jemli
Fix
usagestrin
g
for git-branch
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-10-20
Lars
Hjemli
Fix typo
i
n show-index
.
c
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree