repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
2010-07-19
Jens Lehmann
g
i
t
submodule add:
Requ
i
re the new --force op
t
ion
t
o
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-07-12
Jens Lehmann
git
a
d
d
: Add th
e
"-
-
ignore-m
i
ssing"
o
ption for
the
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-25
Jens Leh
m
ann
Add the opti
o
n
"--ignore-submodules" to "git status"
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-25
J
e
ns Le
h
man
n
git submodule:
i
gn
o
re dirt
y
subm
o
dules
for summar
y
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-11
Jens
Lehmann
Ad
d
o
ptional parameters to the diff option "--ign
o
re
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-06-11
Jens Lehmann
g
i
t diff: rename te
s
t
that had a c
o
nflicti
n
g n
a
me
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-17
Je
n
s
L
ehmann
gitk: Display d
i
rty s
u
b
m
o
dules correctly
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-10
Jens L
e
hmann
Teach dif
f
--submodule and stat
u
s to
h
and
l
e
.
git
f
iles
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-04-10
Jen
s
Le
h
mann
Let check_prei
m
ag
e
(
)
use memset() to in
i
tialize "struct
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-20
Jens
L
eh
m
ann
gitk: Ad
d
Ctr
l
-W shortcut
f
or closing the
a
ctive window
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-14
Jens Lehm
a
nn
g
it
status: ignor
i
ng u
n
tracked files mu
s
t ap
p
l
y
to
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-13
Jens Lehmann
git st
a
tu
s
:
F
i
x false
p
osit
i
ve "n
e
w
com
m
its" output
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-13
Jens L
e
hmann
R
efac
t
or d
i
rty submodule detection in diff-lib
.
c
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-10
Jens Lehmann
git
s
ubmodule
sum
m
ary: Handle HEAD as a
r
gume
n
t
w
hen
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-08
Je
n
s Lehm
a
nn
git status: Show
deta
i
led
dirty status of su
b
modules
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-03-05
Jens Lehmann
git diff --submodule
:
Show detailed d
i
r
t
y
status of
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-02-01
Jens Lehmann
Updates for dirty
s
ubmodul
e
s
i
n release not
e
s and
user
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-31
J
e
ns Lehmann
Fix memory
l
e
a
k in subm
o
d
u
le
.
c
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-28
Jens Lehma
n
n
git-gui: Quote git
p
ath when
s
tarting an
o
ther gui
i
n
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-25
Jens
Lehmann
Teach
diff --submodu
l
e that modi
f
ied su
b
modu
l
e
d
irectory
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-25
Jens Lehmann
git
d
iff: Don't test submodule dirtiness with
-
-ignore
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
Jen
s
Lehmann
gi
t
-gui: Add a
s
pecial diff popup menu for submodules
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
J
e
ns Lehmann
git-gu
i
: Use git diff --sub
m
odule when available
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-23
J
e
ns Lehmann
git-gui
:
Corre
c
t
f
ile_states when unstaging partl
y
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-19
Jens
Leh
m
ann
Perfo
r
man
c
e
op
t
imizat
i
o
n for d
e
te
c
t
ion of modified
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-17
Je
n
s L
e
hmann
g
i
t status: Sh
o
w un
c
omm
i
t
t
e
d submo
d
ule chang
e
s t
o
o
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2010-01-17
Jens Le
h
mann
Show submodules as mod
i
fied wh
e
n t
h
ey co
n
tain a dirty
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-11-03
Jens
L
ehman
n
gitk
:
U
s
e the --s
u
bmodule option for displaying diffs
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-11-03
Je
n
s Lehmann
g
itk: Fi
x
diffing committed -> staged (typo in diffcmd)
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-10-24
Jens Lehmann
a
d
d test
s
f
o
r g
i
t diff
-
-submodul
e
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-09-25
Jens Lehman
n
gi
t
-gui: fix use of uninitialized variable
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-09-22
Jens Leh
m
ann
git submodule
a
dd
:
make the <path> parame
t
er opti
o
na
l
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-27
Jens Lehmann
git-gui: fix diff for
partially st
a
g
e
d
s
u
bmodu
l
e changes
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-15
Jens
Lehm
a
nn
g
i
t submodule
summary: add --fil
e
s
o
p
t
i
o
n
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-10
Jens Lehmann
gi
t
-gui: display summary when showi
n
g diff of a su
b
module
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-08-05
Jens Lehm
a
nn
Docu
m
entation
:
git
submod
u
le: add missing option
s
to
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-08
J
e
ns
Lehmann
git-gu
i
: run post-checkout hook after clone
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Je
n
s Lehma
n
n
git-gui: run po
s
t
-che
c
kou
t
ho
o
k on
checkout
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-04-05
Jen
s
Lehmann
git-gui: When calling post-commit hook
w
rong variab
l
e
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-03-22
Jens Le
h
mann
githo
o
ks document
a
tion:
po
s
t
-
checkout
h
ook i
s
a
lso
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree
2009-03-20
J
e
ns
Lehmann
git-gu
i
: Fix mer
g
e c
o
nfli
c
t display
e
rror when f
i
lename
.
.
.
Signed-off-by:
Jens Lehmann
<Jens.Lehmann@web.de>
commit
|
commitdiff
|
tree