Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'pb/maint-use-custom-perl' into maint | Junio C Hamano | 2009-12-03 | 4 | -4/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/config-pathname-tilde-expand' into maint | Junio C Hamano | 2009-12-03 | 5 | -37/+69 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/grep-i-F' into maint | Junio C Hamano | 2009-12-03 | 4 | -6/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-break-rename-reduce-memory' into maint | Junio C Hamano | 2009-12-03 | 2 | -3/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rj/maint-simplify-cygwin-makefile' into maint | Junio C Hamano | 2009-12-03 | 1 | -4/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rg/doc-workflow' into maint | Junio C Hamano | 2009-12-03 | 1 | -0/+115 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'np/maint-sideband-favor-status' into maint | Junio C Hamano | 2009-12-03 | 2 | -23/+23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: xmlto 0.0.18 does not know --stringparam | Junio C Hamano | 2009-12-03 | 1 | -0/+7 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Describe (possible) gitweb.js minification in gitweb/README | Jakub Narebski | 2009-12-03 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix crasher on encountering SHA1-like non-note in notes tree | Johan Herland | 2009-12-03 | 2 | -0/+174 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' | Brandon Casey | 2009-12-03 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge in 1.6.5.4 | Junio C Hamano | 2009-12-03 | 2 | -3/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 1.6.5.4v1.6.5.4 | Junio C Hamano | 2009-12-03 | 2 | -2/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unconditionally set man.base.url.for.relative.links | Junio C Hamano | 2009-12-03 | 1 | -2/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-12-03 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make | Junio C Hamano | 2009-12-03 | 1 | -0/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 1.6.6-rc1v1.6.6-rc1 | Junio C Hamano | 2009-12-02 | 2 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-pull.sh: Fix call to git-merge for new command format | Horst H. von Brand | 2009-12-02 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-12-02 | 3 | -12/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare for 1.6.5.4 | Junio C Hamano | 2009-12-02 | 2 | -1/+33 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | merge: do not add standard message when message is given with -m option | Junio C Hamano | 2009-12-02 | 2 | -11/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not misidentify "git merge foo HEAD" as an old-style invocation | Junio C Hamano | 2009-12-02 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.6.6 before -rc1 | Junio C Hamano | 2009-12-01 | 1 | -20/+67 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-12-01 | 4 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | help: Do not unnecessarily look for a repository | David Aguilar | 2009-12-01 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: Fix a few i.e./e.g. mix-ups | Michael J Gruber | 2009-12-01 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: Document --branch option in git clone synopsis | David Soria Parra | 2009-11-30 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/deprecate-old-syntax-from-merge' | Junio C Hamano | 2009-12-01 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-merge: a deprecation notice of the ancient command line syntax | Junio C Hamano | 2009-12-01 | 1 | -0/+6 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/remote-get-ref-states-fix' | Junio C Hamano | 2009-12-01 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_ref_states: strdup entries and free util in stale list | Bert Wesarg | 2009-12-01 | 1 | -2/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-blame' | Junio C Hamano | 2009-12-01 | 6 | -88/+1173 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Add link to other blame implementation in blame views | Jakub Narebski | 2009-12-01 | 1 | -0/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Make linking to actions requiring JavaScript a feature | Jakub Narebski | 2009-11-30 | 1 | -1/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb.js: fix padLeftStr() and its usage | Stephen Boyd | 2009-11-25 | 1 | -5/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb.js: Harden setting blamed commit info in incremental blame | Jakub Narebski | 2009-11-25 | 1 | -1/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb.js: fix null object exception in initials calculation | Stephen Boyd | 2009-11-19 | 1 | -2/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Minify gitweb.js if JSMIN is defined | Jakub Narebski | 2009-09-01 | 1 | -0/+20 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Create links leading to 'blame_incremental' using JavaScript | Jakub Narebski | 2009-09-01 | 2 | -9/+53 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Colorize 'blame_incremental' view during processing | Jakub Narebski | 2009-09-01 | 2 | -3/+110 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Incremental blame (using JavaScript) | Jakub Narebski | 2009-09-01 | 6 | -88/+940 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Add optional "time to generate page" info in footer | Jakub Narebski | 2009-09-01 | 2 | -0/+36 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fc/maint-format-patch-pathspec-dashes' | Junio C Hamano | 2009-11-30 | 2 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: add test for parsing of "--" | Felipe Contreras | 2009-11-26 | 1 | -0/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: fix parsing of "--" on the command line | Felipe Contreras | 2009-11-26 | 1 | -1/+2 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/maint-merge-ff-error-message-fix' | Junio C Hamano | 2009-11-30 | 3 | -18/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-merge: show user-friendly error messages for fast-forward too. | Matthieu Moy | 2009-11-29 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: make the error-message generation an extern function | Matthieu Moy | 2009-11-29 | 2 | -13/+21 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ap/maint-merge-strategy-list-fix' | Junio C Hamano | 2009-11-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-merge.c: call exclude_cmds() correctly. | Avery Pennarun | 2009-11-29 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |