repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'bc/master-diff-hunk-header-fix'
2008-09-29
S
hawn O
.
P
earc
e
Merge branch
'
bc/master-d
i
ff-hu
n
k-heade
r
-f
i
x'
commit
|
commitdiff
|
tree
2008-09-29
S
hawn O
.
Pearce
Merge bra
n
ch 'maint' into bc/mast
e
r-diff-hunk
-
header-fix
commit
|
commitdiff
|
tree
2008-09-29
Sh
a
wn O
.
Pearce
M
e
rge branch 'bc/maint-diff-hu
n
k-head
e
r-fix'
into maint
commit
|
commitdiff
|
tree
2008-09-29
Shawn
O
.
Pearce
Merge branc
h
'jc/better-conflict-re
s
olution'
commit
|
commitdiff
|
tree
2008-09-29
Shawn O
.
Pearc
e
Me
r
ge bra
n
ch 'mg
/
ma
i
nt-remote-fix' into maint
commit
|
commitdiff
|
tree
2008-09-29
Nanako Shi
r
aishi
Add
co
n
t
rib/rerere-train script
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Raf
a
e
l
G
arc
i
a
-Suarez
Clarify commit error
m
essage f
o
r unme
r
g
e
d fi
l
es
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Johan Herland
Use strchrnul
(
) instead of strchr()
p
lus manual
w
o
r
karound
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Dmitry Potapov
mingw: re
m
o
v
e use of _getd
r
ive()
f
rom lsta
t
/f
s
tat
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Alex
R
iesen
Use remove_path fro
m
dir
.
c instead of own im
p
lementatio
n
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Al
e
x Riesen
Add remo
v
e_path: a function to remove
as muc
h
as possible
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
P
ing Yin
g
i
t
-submodu
l
e:
F
ix "Una
b
l
e
to checkout" f
o
r the initia
l
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Johannes Six
t
compa
t
/ming
w
: Su
p
port a t
i
meout in the pol
l
emulat
i
on
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Stephen Haberman
Clari
f
y h
o
w the user can
s
atisfy stash's
'di
r
t
y
s
t
ate
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-29
Na
n
a
ko Sh
i
raishi
usa
g
e
.
c: remove unu
s
ed functions
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-26
Shawn
O
.
Pearce
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2008-09-26
Alex Ries
e
n
Cleanup
remove_path
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-26
Alex
R
iesen
Remove
e
mpt
y
directories in recurs
i
ve merg
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-26
Chris
Fre
y
Documentation: cla
r
ify the
det
a
i
l
s
o
f overri
d
ing LE
S
S
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Sh
a
wn O
.
Pearce
M
e
rge bran
c
h 'mv/merge-recur
s
iv
e
'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge branch
'jc/alternate-push'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge branch 'am/status'
commit
|
commitdiff
|
tree
2008-09-25
Sha
w
n O
.
Pearce
Mer
g
e
bran
c
h 'p
b
/autocorrect
-
wr
a
pp
e
r'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge branch 'm
v
/comm
i
t
-tree'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearc
e
Merge bra
n
ch 'jc/appl
y
-
include-
e
xclude'
commit
|
commitdiff
|
tree
2008-09-25
Shawn
O
.
Pearce
M
e
rge branch 'jc/safe-c-l-d'
commit
|
commitdiff
|
tree
2008-09-25
Giuseppe Bilotta
gi
t
web: s
h
ortlog now also obeys $hash_parent
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
Merge branch 'h
o
/
dirstat-b
y
-fil
e
'
commit
|
commitdiff
|
tree
2008-09-25
Shawn O
.
Pearce
M
e
r
ge git://re
p
o
.
or
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
2008-09-25
Shaw
n
O
.
P
earce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-25
Shawn
O
.
Pearc
e
Upda
t
e
release
n
otes for 1
.
6
.
0
.
3
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
J
o
han Herland
Fix submodule sync wit
h
rel
a
ti
v
e submodule URLs
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
N
anako
Shiraishi
graph
.
c
: make many functions
s
tatic
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Nanako
Shiraishi
remote
.
c: ma
k
e
f
ree_ref(),
pars
e
_push_r
e
fspec()
a
nd
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Jonas Fons
e
ca
checkout: Do
n
ot
show local changes
w
hen
i
n quiet mod
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-25
Johan Her
l
an
d
f
o
r-each-
r
ef:
Fix --forma
t
=%(subject) for
l
o
g message
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
P
e
tr Baudi
s
git-web
-
-browse: Suppor
t
for usin
g
/bi
n
/start on Mi
n
G
W
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavrilov
git-gui:
R
e
e
na
b
le staging unmerg
e
d files by clicking
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexa
n
de
r
G
a
vrilov
g
i
t-gui: S
u
pport
t
he encoding men
u
in gu
i
blame
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavrilov
git-gui: Optimize
encoding
name re
s
olution using a
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexande
r
G
avri
l
o
v
git-gui: Allow forcing display enco
d
ing
for diffs using
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Ga
v
rilov
git-
g
ui: Add a menu of availabl
e
encodings
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavrilov
g
i
t
-gui: Cleanup handli
n
g
o
f
the
defau
l
t enco
d
i
n
g
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pea
r
ce
git-gui: A
s
sume `blame --
i
ncreme
n
ta
l
` out
p
ut is in
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pearce
g
i
t-gui: Use
git
a
ttribute
"
encodin
g
"
for file cont
e
n
t
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Josh
u
a
W
illiams
git-gu
i
: Add s
u
pport for calli
n
g out to the prep
a
re
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Sh
a
wn
O
.
Pearce
git
-
gu
i
:
Hide commit re
l
ated UI
d
u
ring citool --nocommit
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavrilov
git-gui: Add more i
n
te
g
ratio
n
options to citool
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Bra
n
don Case
y
g
it-stash
.
sh: d
o
n
'
t default to refs/stash if inva
l
i
d
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Garry Dolley
Fi
x
ed some grammatical errors in git-
r
ebase
.
txt do
c
u
mentation
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Deskin Miller
maint: check return of split_cmd
l
ine to avoid bad config
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-13
Ch
r
istian Stimming
git-gui: Updat
e
d German translation
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
S
h
awn O
.
Pearce
Merge
b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2008-09-05
Shawn O
.
Pearce
gi
t
-gu
i
: F
i
x
diff pars
i
ng for lin
e
s star
t
ing wi
t
h
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
git
-
gui:
S
how
s
p
e
ci
a
l diffs for comple
x
conflict c
a
ses
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alex
a
nd
e
r
G
a
vr
i
l
o
v
gi
t
-gui: M
a
ke F5
r
eselect
a
di
f
f, i
f
an untracked f
i
le
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alex
a
nder Ga
v
ril
o
v
git-
g
ui:
R
eimplement a
n
d enhance auto-selecti
o
n
of
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
git-gui: Support conflic
t
stat
e
s _U & UT
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
A
l
exander Gavrilov
git-gui: Su
p
port mo
r
e merge
t
o
o
l
s
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavr
i
lov
git-gui: Don't
allow staging files with confl
i
cts
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexan
d
er Gavrilo
v
git-gui: Support
calling me
r
ge t
o
ols
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavri
l
ov
g
i
t-gui: Support resolving conflicts
via the dif
f
context
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
C
h
ristian Sti
m
m
i
ng
git-gui: Mark fo
r
gotten
s
t
r
ings fo
r
t
ransl
a
tion
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-01
Shawn O
.
Pearce
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-09-01
A
l
exander
Gavrilov
git-
g
ui:
F
ix string escapin
g
in
p
o2msg
.
sh
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-01
C
l
emens Bu
c
hacher
g
i
t gui
:
sh
o
w d
i
ffs w
i
th
a mini
m
u
m o
f
1
conte
x
t
li
n
e
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
A
l
ex
a
nder G
a
vrilov
gi
t
-gui: All
o
w speci
f
ying
a
n
initial lin
e
f
or git
gui
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
Alexander
Gavrilov
git-gui: Better positioning i
n
Blame Parent
C
o
m
mit
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
A
lexa
n
der Gavril
o
v
git-gui: Support p
a
ssing bl
a
me to a pa
r
ent
c
omm
i
t
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
Alexander Gavrilov
git-gui: S
u
pport starting gitk
f
rom Gu
i
Blame
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-25
Gus
t
af Hendeby
g
i
t-g
u
i: Teach git gui ab
o
ut file type chang
e
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-13
Alexandre Bourget
g
i
t-gui: update all r
e
ma
i
ning
t
ranslations to French
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-13
Alexandre
B
ourget
git-gui: Upd
a
te french translatio
n
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-10
Shawn O
.
Pearce
git-
g
ui 0
.
11
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-05
Johannes
S
ixt
g
i
t-gui:
A
da
p
t
d
is
c
overy of og
u
ilib t
o
exe
c
dir 'libexec
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miche
l
e
B
allabio
git-g
u
i
:
a
dd a part abo
u
t
format strings
i
n po/README
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-03
Mi
c
hele
Ballabio
git-g
u
i: upd
a
te po/it
.
po
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-03
し
らいしななこ
git-gui: update
J
ap
a
nese translation
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-02
Mika
e
l Magn
u
sson
git-gui: Update swedish translation
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-02
Shawn O
.
Pe
a
rce
git-gui: Upd
a
te g
i
t-g
u
i
.
pot for 0
.
1
1 ne
a
ring release
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-08-02
Ch
r
istian St
i
m
m
ing
git-gui: Update Germa
n
translation
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-30
S
t
effen Prohaska
git-g
u
i
(Wind
o
ws): Change wr
a
pp
e
r
to exec
d
ir 'libexec
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-30
Ste
f
fen Proh
a
ska
git
-
gui (Windows): Switch
to rel
a
tiv
e
discovery of
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-30
Steffen Prohaska
git-
g
ui: Co
r
re
c
t installat
i
on of library to be
$
prefix
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-30
S
h
awn O
.
P
e
arce
git-gui: Fix
gitk search in $PATH to work
o
n
W
ind
o
w
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-27
Al
e
xander Gavrilov
git-gui: Preserve scr
o
ll position
o
n
r
eshow_diff
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-27
A
l
exa
n
der Gavri
l
ov
git-gui: Fix t
h
e Remote
menu separator
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-26
J
o
hannes
S
ixt
git-gu
i
:
"
Stage Line": Treat indep
e
ndent
changes in
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-26
Joh
a
nnes Sixt
git-gui: Fix
"
S
t
age/Uns
t
age L
i
ne
"
with
o
ne line of
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-25
Sh
a
wn O
.
Pearc
e
git-gui: Correct 'Visualize Branches'
o
n Mac OS X to
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-25
Abhijit Me
n
on-Sen
git-gui: Look for g
i
tk
i
n $PA
T
H, not
$LIBEXEC/git-core
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-17
A
l
exand
e
r G
a
vrilov
Add a menu item
to invoke
full copy
d
etection in blame
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-17
Alexa
n
d
er G
a
vrilov
Ki
l
l
the blame ba
c
k-end on windo
w
close
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-17
A
l
e
xander Gavrilov
A
d
d op
t
ions to contro
l
the
s
earch for
copies
i
n
blame
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-17
Alexand
e
r G
a
vrilov
Fix pre-com
m
it
hooks
u
nde
r
MinGW
/
M
S
YS
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-13
Johanne
s
Schindelin
git-g
u
i:
MERGE
_
R
R lives in
.
gi
t
/ directly with newer
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-08
Soere
n
Finster
g
it-gui: Exit short
c
ut in
MacOSX re
p
aired
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-07-02
Johan
n
es
S
ixt
gi
t
-gui: Imple
m
ent "Stage/Unstage
Line"
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-06-25
Ab
h
iji
t
M
enon-S
e
n
git-gui:
D
on't s
e
le
c
t the wro
n
g f
i
le if the
l
ast listed
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-06-21
Richa
r
d Quirk
git-
g
ui: Fix acc
i
denta
l
sta
g
ed stat
e
t
oggl
e
when clic
k
ing
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
next