repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2009-02-07
Lars Hjeml
i
tree
.
c:
allow
r
ead_
t
ree_recursive() to traverse gitlink
.
.
.
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-07-27
Lars Hjemli
builtin-
b
ranch:
f
ix
-
v
for --[no-]merged
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-07-27
Lars Hjemli
builtin-br
a
nch:
f
act
o
r out merge_f
i
lter matching
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-07-27
L
a
r
s
H
je
m
li
b
uiltin-branch: remove d
u
p
l
icated c
o
d
e
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-05-12
Lars Hjemli
revision
.
c:
really honor --first-parent
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-21
Lar
s
Hjem
l
i
Add tests for `branch --[no
-
]merged`
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-21
Lars Hjemli
git-bra
n
ch
.
txt
:
compare --c
o
ntains, --
m
erged and
-
.
.
.
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-21
Lars Hje
m
l
i
git-branch: add supp
o
rt for
--merged an
d
-
-
n
o-merged
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-09
Lars
Hjemli
T
e
a
ch GIT
-
VERS
I
O
N
-GE
N
a
b
out th
e
.
git file
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-09
Lars Hjemli
T
each git-submod
u
le
.
s
h about the
.
git file
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-09
Lars
H
j
emli
Te
a
ch reso
l
v
e
_gitlink_ref() about the
.
git fil
e
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-04-09
L
a
rs Hjemli
Add
p
latf
o
rm
-
indepen
d
ent
.
g
i
t
"syml
i
nk"
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-02-19
Lars
H
jemli
Simplif
y
set
u
p of $GIT_DIR
i
n
gi
t
-sh-s
e
tup
.
sh
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2008-01-18
L
a
rs H
j
eml
i
Move sh
a
1_f
i
le
_
to
_
archive into lib
g
it
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-11-10
Lars Hjemli
for-each-r
e
f: fix se
t
up o
f
o
ption
-
p
arsing for --sort
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-10-31
Lars Hjeml
i
Make merg
e
-recursive ho
n
o
r di
f
f
.
r
ena
m
elim
i
t
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-10-29
L
a
rs Hjemli
Tea
c
h
git
-
pull about -
-
[
n
o-]ff, --no
-
sq
u
ash and --commi
t
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-26
Lars Hje
m
li
Make merge-r
e
cursive
h
o
n
o
r
diff
.
r
enamel
i
mit
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-24
La
r
s Hjemli
git-merge: add
--
f
f and
--no-ff optio
n
s
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-24
Lars H
j
e
m
l
i
git-merge: add support for --commit
and --no-squash
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-24
Lars
H
jemli
git-merge:
add suppo
r
t f
o
r
b
r
a
n
ch
.
<na
m
e
>
.
mergeopti
o
n
s
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-24
Lars Hjemli
git-merge: refactor option parsing
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-24
L
a
rs
Hjemli
git
-
merg
e
:
fi
x
faulty
SQ
U
ASH_MSG
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-24
Lars Hjeml
i
A
d
d tes
t
-
s
c
ript for git-mer
g
e porcelain
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-07
La
r
s Hje
m
l
i
git-svn: always u
s
e
-
-
f
i
rst-parent
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-09-05
Lars Hjemli
g
i
t-s
v
n: ad
d
support for
-
-fi
r
s
t
-pare
n
t
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-08-17
La
r
s Hjemli
g
it-
s
ubmo
d
ul
e
: re-enable 'status' as the
d
efault subcommand
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-07-07
L
a
rs Hj
e
mli
gi
t
-su
b
module(1): update description a
n
d
k
ey
names
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-16
Lars
H
j
e
mli
gitmodules(5): remove le
a
ding peri
o
d
f
rom s
y
nopsis
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-12
L
a
r
s Hjemli
Ad
d
g
i
t
m
o
d
ules(
5
)
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-12
Lars Hjemli
git-
s
ubmodule: give submodul
e
s
p
ro
p
er names
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-12
Lars H
j
emli
Rena
m
e sectio
n
s
f
r
om "mo
d
u
l
e
" to "
s
ubmodul
e
" in
.
gitmodules
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-12
Lars Hjemli
git-submodul
e
:
r
e
m
e
mber
to checkout af
t
er
c
lone
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-12
Lars Hjemli
t7400:
barf if git-submodule
r
emoves or replaces a
.
.
.
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-06
Lars
H
j
emli
git-
s
ubmod
u
le: clon
e
during up
d
ate, not
d
u
r
i
n
g
i
n
it
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-06
Lars Hj
e
mli
git-submodule: m
o
ve cloning into
a
separate function
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-06-02
La
r
s
Hjemli
Add
b
asic t
e
st-scr
i
pt
for g
i
t-sub
m
odu
l
e
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-05-27
Lars Hjemli
Add git-submodule
c
om
m
and
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-05-12
Lars
H
j
emli
git-arch
i
ve: don't die when reposit
o
ry
u
ses subpr
o
jects
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjemli
Make buil
t
in-branch
.
c
handle the git co
n
fig file
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjemli
rena
m
e
_ref(): only print a
w
arni
n
g wh
e
n
config-file
.
.
.
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-01-08
Lars Hjeml
i
git-branch: show d
e
tached HEAD
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
Lars Hjemli
R
efa
c
tor print
-
functions in b
u
iltin-branch
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2007-01-03
Lars
Hjemli
S
kip
excessive blank
l
i
n
e
s
b
e
fore commi
t
bod
y
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-12-06
Lars Hjeml
i
git-branch: let caller specify
logmsg
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-12-06
Lars Hjemli
rename_ref: use
lstat
(
2) when testing f
o
r symlink
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-12-06
La
r
s
H
j
e
mli
git-branch: a
d
d options and tests for branch
r
e
naming
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-11-25
Lars Hj
e
mli
Ad
d
-v and --a
b
b
rev
o
pt
i
ons to git-branch
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-10-27
Lars Hje
m
li
Fix
s
h
ow-ref
u
s
agestring
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-10-24
Lars Hjemli
M
ake git-branch a builtin
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-10-22
Lar
s
Hjemli
F
i
x usa
g
es
t
ring for git-branch
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree
2006-10-20
Lars
H
jemli
Fix t
y
p
o in show-index
.
c
Signed-off-by:
Lars Hjemli
<hjemli@gmail.com>
commit
|
commitdiff
|
tree