Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | grep: honor --textconv for the case rev:pathmg/more-textconv | Michael J Gruber | 2013-05-10 | 1 | -5/+6 |
* | grep: allow to use textconv filters | Jeff King | 2013-05-10 | 1 | -0/+2 |
* | cat-file: do not die on --textconv without textconv filters | Michael J Gruber | 2013-05-10 | 1 | -10/+8 |
* | show: honor --textconv for blobs | Michael J Gruber | 2013-05-10 | 1 | -3/+22 |
* | diff_opt: track whether flags have been set explicitly | Junio C Hamano | 2013-05-10 | 1 | -0/+1 |
* | Merge branch 'jk/merge-tree-added-identically' | Junio C Hamano | 2013-04-18 | 1 | -13/+13 |
|\ | |||||
| * | merge-tree: don't print entries that match "local" | John Keeping | 2013-04-08 | 1 | -13/+13 |
* | | Merge branch 'fc/send-email-annotate' | Junio C Hamano | 2013-04-18 | 1 | -81/+85 |
|\ \ | |||||
| * | | format-patch: trivial cleanups | Felipe Contreras | 2013-04-07 | 1 | -36/+35 |
| * | | format-patch: add format.coverLetter configuration variable | Felipe Contreras | 2013-04-07 | 1 | -6/+26 |
| * | | log: update to OPT_BOOL | Felipe Contreras | 2013-04-07 | 1 | -7/+7 |
| * | | format-patch: refactor branch name calculation | Felipe Contreras | 2013-04-07 | 1 | -17/+16 |
| * | | format-patch: improve head calculation for cover-letter | Felipe Contreras | 2013-04-07 | 1 | -18/+4 |
* | | | Merge branch 'kb/co-orphan-suggestion-short-sha1' | Junio C Hamano | 2013-04-18 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | checkout: abbreviate hash in suggest_reattach | Kevin Bracey | 2013-04-08 | 1 | -1/+1 |
* | | | | Merge branch 'rt/commentchar-fmt-merge-msg' | Junio C Hamano | 2013-04-15 | 1 | -7/+11 |
|\ \ \ \ | |||||
| * | | | | fmt-merge-msg: use core.commentchar in tag signatures completely | Ralf Thielow | 2013-04-07 | 1 | -4/+8 |
| * | | | | fmt-merge-msg: respect core.commentchar in people credits | Ralf Thielow | 2013-04-07 | 1 | -3/+3 |
* | | | | | Merge branch 'jk/show-branch-strbuf' | Junio C Hamano | 2013-04-15 | 1 | -9/+8 |
|\ \ \ \ \ | |||||
| * | | | | | show-branch: use strbuf instead of static buffer | Jeff King | 2013-04-06 | 1 | -9/+8 |
* | | | | | | Merge branch 'po/help-guides' | Junio C Hamano | 2013-04-14 | 1 | -7/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | help: mark common_guides[] as translatable | Simon Ruderich | 2013-04-12 | 1 | -7/+7 |
* | | | | | | | Sync with 'maint' | Junio C Hamano | 2013-04-12 | 2 | -5/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 2013-04-12 | 1 | -3/+3 |
| * | | | | | | | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-04-12 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | fast-export: fix argument name in error messages | Paul Price | 2013-04-12 | 1 | -2/+2 |
| * | | | | | | | | Merge branch 'nd/index-pack-threaded-fixes' into maint | Junio C Hamano | 2013-04-04 | 1 | -8/+26 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/index-pack-correct-depth-fix' into maint | Junio C Hamano | 2013-04-04 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'po/help-guides' | Junio C Hamano | 2013-04-11 | 1 | -2/+44 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | / / / | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | builtin/help.c: add list_common_guides_help() function | Philip Oakley | 2013-04-02 | 1 | -3/+33 |
| * | | | | | | | | | builtin/help.c: add --guide option | Philip Oakley | 2013-04-02 | 1 | -2/+8 |
| * | | | | | | | | | builtin/help.c: split "-a" processing into two | Philip Oakley | 2013-04-02 | 1 | -1/+7 |
* | | | | | | | | | | Merge branch 'jk/rm-removed-paths' | Junio C Hamano | 2013-04-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rm: do not complain about d/f conflicts during deletion | Jeff King | 2013-04-04 | 1 | -1/+1 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'mg/gpg-interface-using-status' into maint | Junio C Hamano | 2013-04-03 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'bc/commit-complete-lines-given-via-m-option' into maint | Junio C Hamano | 2013-04-03 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/describe' into maint | Junio C Hamano | 2013-04-03 | 1 | -21/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ph/tag-force-no-warn-on-creation' into maint | Junio C Hamano | 2013-04-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Sync with 1.8.1 maintenance track | Junio C Hamano | 2013-04-03 | 2 | -6/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 2 | -6/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1 | Junio C Hamano | 2013-04-03 | 1 | -4/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'rr/triangle' | Junio C Hamano | 2013-04-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | remote.c: introduce a way to have different remotes for fetch/push | Ramkumar Ramachandra | 2013-04-02 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | fast-export: Allow pruned-references in mark file | Antoine Pelisse | 2013-04-07 | 1 | -4/+7 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'sg/gpg-sig' | Junio C Hamano | 2013-04-05 | 1 | -1/+36 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | merge/pull Check for untrusted good GPG signatures | Sebastian Götte | 2013-03-31 | 1 | -0/+3 |
| * | | | | | | | | | | | | | | | | merge/pull: verify GPG signatures of commits being merged | Sebastian Götte | 2013-03-31 | 1 | -1/+33 |
* | | | | | | | | | | | | | | | | | Merge branch 'jc/merge-tag-object' | Junio C Hamano | 2013-04-05 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | merge: a random object may not necssarily be a commit | Junio C Hamano | 2013-03-19 | 1 | -0/+13 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |