repo.or.cz
/
git
/
kirr.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/notes: clean up description of rewriting configuration
2010-05-09
Jonathan Nieder
Docu
m
entation/notes:
clean up de
s
cription of rewrit
i
ng
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nie
d
er
D
o
cumenta
t
ion/not
e
s: simplify treatment of def
a
ul
t
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentati
o
n/log:
a
dd
a
C
ONFIGURATION section
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Nieder
Documentation/notes: s
i
m
p
lify t
r
e
atment of def
a
ult
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onat
h
an Nieder
Documentation/notes: add configuration section
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Doc
u
mentation/note
s
: descri
b
e conte
n
t
of
no
t
es blobs
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Nieder
D
o
c
umentat
i
on/no
t
es: document fo
r
mat of n
o
tes trees
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
Jo
n
athan Nie
d
er
Documentation
/
Makefile: fix interru
p
ted builds
o
f user
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jo
n
athan Nieder
tag -v: use RUN
_
GIT_CM
D
t
o
run verify-tag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Ni
e
der
Do
c
ument
new "already-merged" rule for branch
-d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
o
n
a
than Nieder
Add
.
de
p
end directori
e
s to
.
gitignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jona
t
han
Nied
e
r
Tea
c
h
mailinfo %
<
as an
alternativ
e
scissors mark
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan
Nieder
M
a
kefile
:
future-proof Cygwi
n
version ch
e
ck
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
me
r
ge
-
recursiv
e
: add a
l
abel for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
cherry-pick, revert: add a label for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
an Niede
r
revert: clarify
l
abel on
conflic
t
hunks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan N
i
eder
comp
a
t: add mem
p
cpy()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an
N
i
e
der
chec
k
out -m --con
f
lict=diff
3
: add a label for ance
s
t
o
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
m
e
rge_trees(): ad
d
ancesto
r
label parameter for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
merge_file(): add comm
e
nt explaining
beha
v
ior
wrt co
n
f
lict
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
checkout --conflict
=
diff3:
a
dd a label for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
ll_mer
g
e(): add
ancestor labe
l
parameter for d
i
ff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
mer
g
e
-file --diff3: add a label for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
xdl_merge()
:
move file1 and file2 labels to xmparam
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
than Nied
e
r
x
d
l
_merge(): add
o
p
tional ancestor label
t
o
d
i
f
f3-style
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
on
a
t
h
an Ni
e
der
tests: doc
u
ment cherry-pick behavior
i
n
face of conflict
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
tests: document format of conflicts from ch
e
ckout -m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
revert: fix tiny memory le
a
k
i
n cherry-
p
ick --ff
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonath
a
n Nie
d
er
Ma
k
efile
:
F
ix occasional GIT-CFLAGS break
a
ge
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Makefile: Fix CDPATH problem
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonatha
n
Nieder
git
k
: Don't clobber "Remember this view" setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
gitk: A
d
d
c
omments
t
o explain
encod
e
_view_o
p
t
s and
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
Jonatha
n
Nieder
Makefil
e
: clarify definition of TEST_O
B
J
S
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
J
on
a
than Nieder
a
m
: remov
e
re
b
ase-
a
p
ply di
r
ectory before gc
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
Jonat
h
an Nieder
tests: Fix race condition
i
n t7006-pa
g
er
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
Jonat
h
an
N
ieder
t7006-pager
:
if stdout is not
a
term
i
nal, make a new one
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jonat
h
an Nieder
tests:
Add
t
e
sts for
a
utoma
t
ic use of page
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
am:
F
i
x
l
aunching of p
a
ger
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nie
d
er
git svn:
Fix l
a
unching of p
a
ger
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonatha
n
Nieder
git
.
1
: Cl
a
rify the beha
v
ior
of the --p
a
g
inate option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan
Nieder
Make 'git var GIT_PAGER' always
p
rint th
e
co
n
figured
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonath
a
n
N
ied
e
r
Fi
x
'g
i
t
var' usage synopsis
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonatha
n
Nieder
Makefile: a
l
ways remove
.
depend directorie
s
on 'make
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Nieder
Makefile: tuck away gen
e
rated makefile f
r
agme
n
ts
i
n
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jona
t
han Nieder
Do not
i
nstall she
l
l
libraries exec
u
table
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonatha
n
N
i
eder
Te
a
ch Makefile to che
c
k
h
eader dependen
c
ies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan Ni
e
der
Ma
k
efile:
list s
t
and
a
lone
prog
r
am object
f
iles in P
R
O
G
RAM_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
Nieder
M
akef
i
le: lazily
comp
u
te he
a
der
d
ependencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
at
h
an Nied
e
r
M
a
ke
f
ile:
list
g
e
n
erated o
b
ject files in
OBJECT
S
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jona
t
han
Nie
d
er
M
a
kefile: d
i
sab
l
e defau
l
t implicit rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Make
f
ile: rearrange dependen
c
y rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
N
ieder
M
a
kefil
e
:
transp
o
r
t
.
o
depends on
branch
.
h now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
Niede
r
Merge branch 'master' of git://repo
.
or
.
cz/alt-git int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
J
o
nathan Nieder
Makefile: drop dependency on $(wildcard */*
.
h
)
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: c
l
ean up http-walker
.
o dependency
r
ules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
athan Nieder
Makefile: remov
e
wt-st
a
tus
.
h fro
m
LIB
_
H
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
a
t
han Nie
d
er
Makefile: make sure
t
e
s
t helpers a
r
e
r
ebuilt whe
n
hea
d
ers
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonath
a
n Nieder
Makefile: add missing he
a
der fi
l
e
dependenc
i
es
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonath
a
n
N
i
e
der
Doc
u
me
n
tation: merg
e
: use
MERGE_HEAD to refer to th
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Ni
e
der
Documen
t
ation: si
m
pl
i
fy H
o
w
M
e
r
ge W
o
rks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
o
n
athan N
i
eder
Doc
u
mentation: merge: add a sec
t
ion about fast-forward
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nie
d
er
Document
a
tion: emphasize when git merge termina
t
es
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jo
n
ath
a
n Nieder
Docume
n
tation:
m
e
rge: a
d
d an
ove
r
view
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Documentation:
merge
:
move
m
erge strategy
l
i
s
t to end
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
o
nathan Nie
d
er
Do
c
umentat
i
on: suggest
`
r
e
set --merg
e
` in H
o
w Merge
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Documentation: me
r
ge: move
configur
a
t
io
n
s
ection
t
o e
n
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jona
t
ha
n
Nieder
Documentat
i
on
:
tiny
git
config man
u
al tweaks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan N
i
e
de
r
Doc
u
m
e
ntati
o
n: git gc packs refs by defaul
t
now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jon
a
t
h
a
n Nie
d
er
Documentation: tiny g
i
t
c
o
nfig manual twea
k
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
onathan Nie
d
er
Do
c
ument
a
tion: git gc packs
refs by de
f
ault no
w
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-07
Jonathan Nieder
g
i
t-gui: M
a
kefile: cons
o
lidate
.
FORCE-* targets
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jona
t
han Ni
e
d
er
Makefile
:
consolidate
.
FORC
E
-* targets
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nie
d
er
Makefile:
learn t
o
generate
l
istings for targets
r
equiring
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
J
o
natha
n
Nieder
M
akefil
e
:
use tar
g
et-specific variable to pass flags
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan
Nieder
Makefile: reg
e
nera
t
e assembler listings when asked
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
J
on
a
t
h
an Ni
e
der
Makefile: m
a
ke ppc
/
sha1ppc
.
o
dep
e
nd on
GIT-CFLAGS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-28
Jonathan Nied
e
r
Makefil
e
: do not clean
a
rm
d
ire
c
tory
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-18
Jonath
a
n Nieder
Speed u
p
bash
c
ompletion loading
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jo
n
a
than Nieder
P
rovide a
b
uild
time de
f
au
l
t-editor s
e
t
t
ing
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nied
e
r
am -i, git-
s
vn: use
"
git var GIT_PAGER"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
J
onathan Nieder
a
d
d -i, send-email,
s
vn
,
p4,
e
tc: us
e
"git
var GIT_EDITOR
"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
T
eac
h
git var about
GIT_PAGER
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Tea
c
h g
i
t var about GIT_EDITOR
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Suppress warn
i
ngs f
r
om "git v
a
r -
l
"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
J
o
n
a
than
Nieder
Do not use VISUAL editor
o
n d
u
mb
t
ermi
n
als
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
diff --no-i
n
dex:
m
a
k
e th
e
u
s
age string less scary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
on
a
tha
n
N
i
eder
m
e
rge-{recursive,subtre
e
}: us
e
usag
e
f() to print
u
sa
g
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Intr
o
duce usa
g
ef()
that
takes a pr
i
n
t
f-
s
tyle format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan N
i
eder
Let
'git <command
>
-
h' show
u
s
age without a git dir
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
n
athan Nie
d
er
S
h
ow usage
s
t
ring f
o
r 'git
htt
p
-push -h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nieder
Le
t
'git http-fetch -h' show usage outside any g
i
t
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
Show
us
a
ge string for
'git stripspace -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show us
a
ge string for
'
g
it
u
npack
-
fil
e
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage string for 'git sho
w
-index -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
ona
t
han Nie
d
e
r
Sho
w
usage stri
n
g for 'gi
t
re
v
-parse -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage string for 'git merge
-
one-file -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan N
i
eder
Show usage str
i
ng for
'
g
it mailsplit -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nied
e
r
Show usage strin
g
for 'git imap-send -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Niede
r
Show
u
sage
s
tring for 'git
get
-
tar-commit-id -
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan Nieder
Show usage strin
g
fo
r
'git
fas
t
-import -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next